diff --git a/js/client-mainmenu.js b/js/client-mainmenu.js index c259b59a49..9841439a0a 100644 --- a/js/client-mainmenu.js +++ b/js/client-mainmenu.js @@ -1260,7 +1260,7 @@ var bufs = []; var curBuf = 0; if (this.selectType === 'watch' && !this.search) { - bufs[1] = '
'; + bufs[1] = ''; } for (var i in this.starred) { @@ -1278,7 +1278,7 @@ var formatName = BattleLog.escapeFormat(BattleFormats[i].id); bufs[1] += ( '' ); } @@ -1314,7 +1314,7 @@ formatName = formatName.replace('[Gen 7 ', '['); bufs[curBuf] += ( '' ); } @@ -1448,7 +1448,7 @@ if ((!teams[i].format && !teamFormat) || teams[i].format === teamFormat) { var selected = (i === curTeam); if (!this.folderToggleOn) { - bufs[curBuf] += ''; + bufs[curBuf] += ''; count++; if (count % bufBoundary === 0 && curBuf < 4) curBuf++; } else { @@ -1473,7 +1473,7 @@ } } if (!exists) { - bufs[curBuf] += ''; + bufs[curBuf] += ''; count++; if (count % bufBoundary === 0 && curBuf < 4) curBuf++; for (var j = 0; j < folderData.length; j++) { @@ -1483,7 +1483,7 @@ if (count % bufBoundary === 0 && curBuf < 4) curBuf++; } } else { - bufs[curBuf] += ''; + bufs[curBuf] += ''; count++; if (count % bufBoundary === 0 && curBuf < 4) curBuf++; } @@ -1496,19 +1496,18 @@ } } if (!isNoFolder) { - bufs[curBuf] += ''; + bufs[curBuf] += ''; } else { - bufs[curBuf] += ''; + bufs[curBuf] += ''; count++; if (count % bufBoundary === 0 && count != 0 && curBuf < 4) curBuf++; } - console.log(teamFormat); if (!isNoFolder) { for (var i = 0; i < teams.length; i++) { if ((!teams[i].format && !teamFormat) || teams[i].format === teamFormat) { var selected = (i === curTeam); if (teams[i].folder === "") { - bufs[curBuf] += ''; + bufs[curBuf] += ''; count++; if (count % bufBoundary === 0 && curBuf < 4) curBuf++; } @@ -1528,7 +1527,7 @@ for (var i = 0; i < teams.length; i++) { if (teamFormat && teams[i].format === teamFormat) continue; var selected = (i === curTeam); - bufs[curBuf] += ''; + bufs[curBuf] += ''; count++; if (count % bufBoundary === 0 && curBuf < 4) curBuf++; } diff --git a/js/client-teambuilder.js b/js/client-teambuilder.js index 45d0442def..da48d8e855 100644 --- a/js/client-teambuilder.js +++ b/js/client-teambuilder.js @@ -189,10 +189,10 @@ if (this.exportMode) { if (this.curFolder) { - buf = ''; + buf = ''; buf += ''; } else { - buf = 'Default
'; buf += 'Official
'; buf += 'Custom
'; diff --git a/js/client.js b/js/client.js index 36fda0d787..8ef5834b0d 100644 --- a/js/client.js +++ b/js/client.js @@ -2546,7 +2546,7 @@ function toId() { }, initialize: function (data) { if (!this.type) this.type = 'semimodal'; - this.$el.html('').css('max-width', data.maxWidth || 480); + this.$el.html('').css('max-width', data.maxWidth || 480); }, dispatchClickButton: function (e) { @@ -2610,7 +2610,7 @@ function toId() { var buf = ''; this.$el.html(buf); diff --git a/style/battle-log.css b/style/battle-log.css index 588062d357..04f7fa165c 100644 --- a/style/battle-log.css +++ b/style/battle-log.css @@ -330,7 +330,7 @@ button:disabled { } .option { - background: transparent; + background-color: transparent; border: 1px solid transparent; border-radius: 4px; padding: 2px 5px; @@ -341,13 +341,14 @@ button:disabled { white-space: nowrap; overflow: hidden; } -.option.sel { +.option.sel, .option.cur { border-color: #999999; } .option:hover, -.option.sel:hover { +.option.sel:hover, +.option.cur:hover { border-color: #888888; - background: #D5D5D5; + background-color: #D5D5D5; color: black; } @@ -356,9 +357,10 @@ button:disabled { box-shadow: none; } .dark .option:hover, -.dark .option.sel:hover { +.dark .option.sel:hover, +.dark .option.cur:hover { border-color: #777777; - background: rgba(100, 100, 100, 0.5); + background-color: rgba(100, 100, 100, 0.5); color: #FFFFFF; } diff --git a/style/client.css b/style/client.css index 8ddbbb59ad..6fbdf019a2 100644 --- a/style/client.css +++ b/style/client.css @@ -55,41 +55,6 @@ select { border-top-color: #34373b; } -.dark .folderButton, -.dark .popupmenu .folderButton, -.dark .popupmenu .folderButtonOpen, -.dark .popupmenu button.button { - background: #2b2c31; - background: linear-gradient(to bottom, #4e525a, #2b2c31); - box-shadow: inset 0.5px 1px 1px rgba(255, 255, 255, 0.5); - border-color: #34373b; - text-shadow: none; - color: #F9F9F9; -} - -.dark .popupmenu button.folderButtonOver { - background: linear-gradient(to bottom, #2a2a2a, #313131); -} - -.dark .popupmenu button.folderButtonOpen:hover { - color: #F9F9F9; -} - -.dark .popupmenu button.folderButtonOpen:hover, -.dark .folderButton:hover, -.dark .popupmenu button.folderButton:hover, -.dark .popupmenu button.button:hover { - background: #3e4149; - background: linear-gradient(to bottom, #646877, #3e4149); - border-color: #34373b; -} - -.dark .folderButton:hover, -.dark .popupmenu button.folderButton:hover, -.dark .popupmenu button.button:hover { - color: #F9F9F9; -} - .dark .button.cur, .dark .button.cur:hover, .dark .tabbar a.button.cur, @@ -208,63 +173,15 @@ select { border-radius: 0; } -.popupmenu button.button { - outline: none; - cursor: pointer; - text-align: center; - text-decoration: none; - border-radius: 5px; - -webkit-box-shadow: 0 1px 2px rgba(0,0,0,.2), inset 0 -1px 2px rgba(255,255,255,1); - -moz-box-shadow: 0 1px 2px rgba(0,0,0,.2), inset 0 -1px 2px rgba(255,255,255,1); - box-shadow: 0 1px 2px rgba(0,0,0,.2), inset 0 -1px 2px rgba(255,255,255,1); - border-radius: 5px; - font-family: Verdana, Helvetica, Arial, sans-serif; - display: inline-block; - - /* default colors */ - color: #222222; - text-shadow: 0 1px 0 white; - border: solid 1px #AAAAAA; - background: #e3e3e3; - background: linear-gradient(to bottom, #f6f6f6, #e3e3e3); - - font-size: 9pt; - padding: 3px 8px; +.popupmenu .option { + width: 204px; } - .popupmenu i { display: inline-block; width: 16px; color: #777777; } -.popupmenu button.folderButton, -.popupmenu button.folderButtonOpen { - width: 172px; - outline: none; - cursor: pointer; - text-decoration: none; - border-radius: 5px; - -webkit-box-shadow: 0 1px 2px rgba(0,0,0,.2), inset 0 -1px 2px rgba(255,255,255,1); - -moz-box-shadow: 0 1px 2px rgba(0,0,0,.2), inset 0 -1px 2px rgba(255,255,255,1); - box-shadow: 0 1px 2px rgba(0,0,0,.2), inset 0 -1px 2px rgba(255,255,255,1); - border-radius: 5px; - font-family: Verdana, Helvetica, Arial, sans-serif; - display: inline-block; - /* default colors */ - color: #222222; - text-shadow: 0 1px 0 white; - border: solid 1px #AAAAAA; - background: #e3e3e3; - background: linear-gradient(to bottom, #f6f6f6, #e3e3e3); - font-size: 9pt; - padding: 3px 8px; -} - -.popupmenu button.folderButtonOpen { - background: linear-gradient(to bottom, #e4e4e4, #d3d3d3); -} - .button.small, .button.small { font-size: 8pt; @@ -275,16 +192,6 @@ select { font-size: 12pt; padding: 5px 10px; } -.popupmenu button.folderButton:hover, -.popupmenu button.folderButtonOpen:hover, -.popupmenu button.button:hover { - background: #cfcfcf; - background: linear-gradient(to bottom, #f2f2f2, #c2c2c2); - border-color: #606060; -} -.popupmenu button.button:active { - background: linear-gradient(to bottom, #cfcfcf, #f2f2f2); -} .mainmenuwrapper .menugroup .button.disabled, .mainmenuwrapper .menugroup .button.disabled:hover, @@ -300,7 +207,6 @@ select { } .button.cur, -.folderButton.cur, .button.cur:hover { color: #333333; background: #f8f8f8; @@ -624,21 +530,6 @@ p.or:after { .popupmenu li:first-child h3 { margin-top: 0; } -.popupmenu button { - display: block; - font-size: 8pt; - font-family: Verdana, Helvetica, Arial, sans-serif; - margin: 0 0 0 6px; - padding: 2px 3px; - border: 1px solid transparent; - border-radius: 2px; - background: transparent; - color: black; - width: 204px; - text-align: left; - - box-sizing: border-box; -} @media (max-height:590px) { .popupmenu h3 { margin-top: 2px; @@ -653,18 +544,7 @@ p.or:after { } } -.popupmenu button.sel { - border-color: #AAAAAA; - white-space: nowrap; - overflow: hidden; -} -.popupmenu button:hover, -.popupmenu button.sel:hover { - border-color: #888888; - background: #D5D5D5; - color: black; -} -.popupmenu button.button { +.popupmenu .button { margin: 2px auto 5px; width: 184px; } @@ -845,6 +725,7 @@ p.or:after { } .dark .pm-window h3.pm-notifying { background: #417589; + color: #BBBBBB; } .pm-window h3.pm-notifying:hover { border-color: #604020; @@ -3090,11 +2971,6 @@ a.ilink.yours { float: left; margin: 2px; padding: 2px; - - border: 1px solid transparent; - border-radius: 4px; - box-shadow: none; - background: transparent; } .avatarlist button { width: 80px; @@ -3107,20 +2983,8 @@ a.ilink.yours { height: 90px; background: url(../fx/client-bgsheet.png) no-repeat scroll 0px 0px; } -.avatarlist button.cur, -.formlist button.cur, -.bglist button.cur { - border-color: #999999; -} -.avatarlist button:hover, -.avatarlist button.cur:hover, -.formlist button:hover, -.formlist button.cur:hover, -.bglist button:hover, -.bglist button.cur:hover { - border: 1px solid #8899AA; - background-color: #F1F4F9; - box-shadow: 1px 1px 1px #D5D5D5; +.formlist button { + background-repeat: no-repeat; } .effect-volume, @@ -3226,20 +3090,6 @@ a.ilink.yours { color: #BBB; } -.dark .popupmenu button, -.dark .bglist button, -.dark .avatarlist button { - color: #AAA; - box-shadow: none; -} -.dark .popupmenu button:hover, -.dark .popupmenu button.sel:hover, -.dark .bglist button:hover, -.dark .avatarlist button:hover { - border-color: #AAAAAA; - background-color: #AAAAAA; - color: black; -} .dark .changeform i { border-color: #bbb; color: #bbb;