From 53733ccdf50662def810bf171ce152452afd57d7 Mon Sep 17 00:00:00 2001 From: Lars Jung Date: Sun, 16 Sep 2012 15:15:07 +0200 Subject: [PATCH] Cleans styles. --- src/_h5ai/css/inc/content.less | 5 +- src/_h5ai/css/inc/dropbox.less | 2 +- src/_h5ai/css/inc/extended-details.less | 9 +- src/_h5ai/css/inc/extended-grid.less | 8 +- src/_h5ai/css/inc/extended-icons.less | 9 +- src/_h5ai/css/inc/extended-list.less | 2 - src/_h5ai/css/inc/extended.less | 13 +- src/_h5ai/css/inc/h5ai-info.less | 2 - src/_h5ai/css/inc/l10n.less | 26 ++-- src/_h5ai/css/inc/preview-img.less | 18 +-- src/_h5ai/css/inc/preview-txt.less | 18 +-- .../css/inc/{context.less => qrcode.less} | 14 +- src/_h5ai/css/inc/responsive.less | 2 +- .../{h5bp-main.less => h5bp-main-footer.less} | 110 --------------- src/_h5ai/css/lib/h5bp-main-header.less | 94 +++++++++++++ src/_h5ai/css/lib/sh/shThemeDjango.less | 120 ---------------- src/_h5ai/css/lib/sh/shThemeEclipse.less | 128 ------------------ src/_h5ai/css/lib/sh/shThemeEmacs.less | 113 ---------------- src/_h5ai/css/lib/sh/shThemeFadeToGrey.less | 117 ---------------- src/_h5ai/css/lib/sh/shThemeMDUltra.less | 113 ---------------- src/_h5ai/css/lib/sh/shThemeMidnight.less | 113 ---------------- src/_h5ai/css/lib/sh/shThemeRDark.less | 113 ---------------- src/_h5ai/css/styles.less | 23 ++-- src/_h5ai/js/inc/ext/qrcode.js | 12 +- 24 files changed, 167 insertions(+), 1017 deletions(-) rename src/_h5ai/css/inc/{context.less => qrcode.less} (71%) rename src/_h5ai/css/lib/{h5bp-main.less => h5bp-main-footer.less} (67%) create mode 100644 src/_h5ai/css/lib/h5bp-main-header.less delete mode 100644 src/_h5ai/css/lib/sh/shThemeDjango.less delete mode 100644 src/_h5ai/css/lib/sh/shThemeEclipse.less delete mode 100644 src/_h5ai/css/lib/sh/shThemeEmacs.less delete mode 100644 src/_h5ai/css/lib/sh/shThemeFadeToGrey.less delete mode 100755 src/_h5ai/css/lib/sh/shThemeMDUltra.less delete mode 100644 src/_h5ai/css/lib/sh/shThemeMidnight.less delete mode 100644 src/_h5ai/css/lib/sh/shThemeRDark.less diff --git a/src/_h5ai/css/inc/content.less b/src/_h5ai/css/inc/content.less index 3c17fbfe..6511f851 100644 --- a/src/_h5ai/css/inc/content.less +++ b/src/_h5ai/css/inc/content.less @@ -5,8 +5,8 @@ font-size: 16px; } - #content-header, #content-footer { + color: #333; a, a:active, a:visited { color: #2080FF; @@ -14,12 +14,11 @@ cursor: pointer; &:hover { - color: #68A9FF; + color: #555; } } } - #content-header { padding-bottom: 12px; margin-bottom: 32px; diff --git a/src/_h5ai/css/inc/dropbox.less b/src/_h5ai/css/inc/dropbox.less index ed8dfefa..785dc2b6 100644 --- a/src/_h5ai/css/inc/dropbox.less +++ b/src/_h5ai/css/inc/dropbox.less @@ -1,7 +1,7 @@ #content { border: 1px dashed #fff; - border-radius: 8px; + .border-radius(8px); .transition(border-color 0.2s ease-in-out); &.hint { diff --git a/src/_h5ai/css/inc/extended-details.less b/src/_h5ai/css/inc/extended-details.less index ff66597f..7c30e340 100644 --- a/src/_h5ai/css/inc/extended-details.less +++ b/src/_h5ai/css/inc/extended-details.less @@ -2,8 +2,6 @@ #extended.view-details { li { - white-space: nowrap; - clear: both; &.header { display: list-item; @@ -14,10 +12,11 @@ a, a:active, a:visited { border-bottom: 1px solid #e8e8e8; } - } - .icon, .label, .date, .size { - padding: 6px; + // needs to be here, to not conflict with header fields + .icon, .label, .date, .size { + padding: 6px; + } } .icon.small { diff --git a/src/_h5ai/css/inc/extended-grid.less b/src/_h5ai/css/inc/extended-grid.less index 73d87fcd..1d69c83c 100644 --- a/src/_h5ai/css/inc/extended-grid.less +++ b/src/_h5ai/css/inc/extended-grid.less @@ -1,6 +1,5 @@ #extended.view-grid { - padding: 3px; li { @@ -8,17 +7,16 @@ float: left; a, a:active, a:visited { + float: left; margin: 2px; padding: 8px; width: 164px; height: 24px; - float: left; - border-radius: 5px; border: 2px solid rgba(0,0,0,0); - white-space: nowrap; + .border-radius(5px); &:hover, &.hover { - border-color: #eee; + border-color: #e8e8e8; } } } diff --git a/src/_h5ai/css/inc/extended-icons.less b/src/_h5ai/css/inc/extended-icons.less index 49c461cf..006bef97 100644 --- a/src/_h5ai/css/inc/extended-icons.less +++ b/src/_h5ai/css/inc/extended-icons.less @@ -1,24 +1,23 @@ #extended.view-icons { - padding: 3px; li { + text-align: center; &.entry { float: left; a, a:active, a:visited { + float: left; margin: 8px; padding: 8px; width: 100px; height: 120px; - float: left; - border-radius: 5px; border: 2px solid rgba(0,0,0,0); - text-align: center; + .border-radius(5px); &:hover, &.hover { - border-color: #eee; + border-color: #e8e8e8; } } } diff --git a/src/_h5ai/css/inc/extended-list.less b/src/_h5ai/css/inc/extended-list.less index 8093afc3..f32e3e86 100644 --- a/src/_h5ai/css/inc/extended-list.less +++ b/src/_h5ai/css/inc/extended-list.less @@ -2,8 +2,6 @@ #extended.view-list { li { - white-space: nowrap; - clear: both; &.entry { diff --git a/src/_h5ai/css/inc/extended.less b/src/_h5ai/css/inc/extended.less index e769312a..8ec706e2 100644 --- a/src/_h5ai/css/inc/extended.less +++ b/src/_h5ai/css/inc/extended.less @@ -13,7 +13,7 @@ display: none; a, a:active, a:visited { - color: #555; + color: #333; cursor: pointer; text-decoration: none; } @@ -26,20 +26,21 @@ li { position: relative; + white-space: nowrap; &.header { display: none; font-size: 13px; a, a:active, a:visited { - padding-bottom: 18px; + padding: 6px 6px 18px 6px; opacity: 0.4; .transition(all 0.2s ease-in-out); - img.ascending, img.descending { + img { + display: none; position: relative; top: -2px; - display: none; width: 12px; height: 12px; padding: 0 8px; @@ -66,6 +67,7 @@ &:hover, &.hover { color: #e80; background-color: #f6f6f6; + border-color: #e8e8e8; } } @@ -139,19 +141,16 @@ display: block; overflow: hidden; text-align: left; - white-space: nowrap; } .date { text-align: right; width: 160px; - white-space: nowrap; } .size { text-align: right; width: 80px; - white-space: nowrap; } } diff --git a/src/_h5ai/css/inc/h5ai-info.less b/src/_h5ai/css/inc/h5ai-info.less index c8bac7cd..1a7cb7a1 100644 --- a/src/_h5ai/css/inc/h5ai-info.less +++ b/src/_h5ai/css/inc/h5ai-info.less @@ -9,8 +9,6 @@ body#h5ai-info { .build-version { display: block; - // font-size: 0.9em; - // color: #aaa; } .build-stamp { display: block; diff --git a/src/_h5ai/css/inc/l10n.less b/src/_h5ai/css/inc/l10n.less index 730e1e67..4ece6ed8 100644 --- a/src/_h5ai/css/inc/l10n.less +++ b/src/_h5ai/css/inc/l10n.less @@ -33,21 +33,21 @@ padding: 0; list-style: none; text-align: left; + } - li { - padding: 8px 24px 10px 24px; - white-space: nowrap; - border-top: 1px solid rgb(231,231,231); - .transition(all 0.2s ease-in-out); + li { + padding: 8px 24px 10px 24px; + white-space: nowrap; + border-top: 1px solid rgb(231,231,231); + .transition(all 0.2s ease-in-out); - &.current { - color: #333; - background-color: rgba(255,255,255,0.8); - } - &:hover { - color: #e80; - background-color: rgba(255,255,255,0.8); - } + &.current { + color: #333; + background-color: rgba(255,255,255,0.8); + } + &:hover { + color: #e80; + background-color: rgba(255,255,255,0.8); } } } diff --git a/src/_h5ai/css/inc/preview-img.less b/src/_h5ai/css/inc/preview-img.less index 6d791b85..f11e9708 100644 --- a/src/_h5ai/css/inc/preview-img.less +++ b/src/_h5ai/css/inc/preview-img.less @@ -120,15 +120,15 @@ } } -#pv-img-topbar { - position: fixed; - z-index: 5; - width: 100%; - left: 0; - top: 0; - .vert-gradient(rgb(37,37,37), rgb(24,24,24)); - border-bottom: 1px solid rgb(27,27,27); -} +// #pv-img-topbar { +// position: fixed; +// z-index: 5; +// width: 100%; +// left: 0; +// top: 0; +// .vert-gradient(rgb(37,37,37), rgb(24,24,24)); +// border-bottom: 1px solid rgb(27,27,27); +// } #pv-img-bottombar { position: fixed; diff --git a/src/_h5ai/css/inc/preview-txt.less b/src/_h5ai/css/inc/preview-txt.less index ddcbcbf3..668e67fe 100644 --- a/src/_h5ai/css/inc/preview-txt.less +++ b/src/_h5ai/css/inc/preview-txt.less @@ -133,15 +133,15 @@ } } -#pv-txt-topbar { - position: fixed; - z-index: 5; - width: 100%; - left: 0; - top: 0; - .vert-gradient(rgb(37,37,37), rgb(24,24,24)); - border-bottom: 1px solid rgb(27,27,27); -} +// #pv-txt-topbar { +// position: fixed; +// z-index: 5; +// width: 100%; +// left: 0; +// top: 0; +// .vert-gradient(rgb(37,37,37), rgb(24,24,24)); +// border-bottom: 1px solid rgb(27,27,27); +// } #pv-txt-bottombar { position: fixed; diff --git a/src/_h5ai/css/inc/context.less b/src/_h5ai/css/inc/qrcode.less similarity index 71% rename from src/_h5ai/css/inc/context.less rename to src/_h5ai/css/inc/qrcode.less index 62db2474..8fa52c13 100644 --- a/src/_h5ai/css/inc/context.less +++ b/src/_h5ai/css/inc/qrcode.less @@ -1,22 +1,16 @@ -#context { - position: fixed; - z-index: 1; +#qrcode { display: none; + position: fixed; right: 16px; bottom: 50px; + z-index: 1; background-color: #fff; border: 2px solid #ddd; padding: 8px; - span { + canvas { display: block; } - - .qrcode { - canvas { - display: block; - } - } } diff --git a/src/_h5ai/css/inc/responsive.less b/src/_h5ai/css/inc/responsive.less index 90fcb19f..54c45c15 100644 --- a/src/_h5ai/css/inc/responsive.less +++ b/src/_h5ai/css/inc/responsive.less @@ -20,7 +20,7 @@ .current { display: block; } -} +} #extended.view-details { .header .label, .entry .label { margin-right: 110px; diff --git a/src/_h5ai/css/lib/h5bp-main.less b/src/_h5ai/css/lib/h5bp-main-footer.less similarity index 67% rename from src/_h5ai/css/lib/h5bp-main.less rename to src/_h5ai/css/lib/h5bp-main-footer.less index 6990a847..9dc81d19 100644 --- a/src/_h5ai/css/lib/h5bp-main.less +++ b/src/_h5ai/css/lib/h5bp-main-footer.less @@ -1,113 +1,3 @@ -/* - * HTML5 Boilerplate - * - * What follows is the result of much research on cross-browser styling. - * Credit left inline and big thanks to Nicolas Gallagher, Jonathan Neal, - * Kroc Camen, and the H5BP dev community and team. - */ - -/* ========================================================================== - Base styles: opinionated defaults - ========================================================================== */ - -html, -button, -input, -select, -textarea { - color: #222; -} - -body { - font-size: 1em; - line-height: 1.4; -} - -/* - * Remove text-shadow in selection highlight: h5bp.com/i - * These selection declarations have to be separate. - * Customize the background color to match your design. - */ - -::-moz-selection { - background: #b3d4fc; - text-shadow: none; -} - -::selection { - background: #b3d4fc; - text-shadow: none; -} - -/* - * A better looking default horizontal rule - */ - -hr { - display: block; - height: 1px; - border: 0; - border-top: 1px solid #ccc; - margin: 1em 0; - padding: 0; -} - -/* - * Remove the gap between images and the bottom of their containers: h5bp.com/i/440 - */ - -img { - vertical-align: middle; -} - -/* - * Remove default fieldset styles. - */ - -fieldset { - border: 0; - margin: 0; - padding: 0; -} - -/* - * Allow only vertical resizing of textareas. - */ - -textarea { - resize: vertical; -} - -/* ========================================================================== - Chrome Frame prompt - ========================================================================== */ - -.chromeframe { - margin: 0.2em 0; - background: #ccc; - color: #000; - padding: 0.2em 0; -} - -/* ========================================================================== - Author's custom styles - ========================================================================== */ - - - - - - - - - - - - - - - - /* ========================================================================== Helper classes diff --git a/src/_h5ai/css/lib/h5bp-main-header.less b/src/_h5ai/css/lib/h5bp-main-header.less new file mode 100644 index 00000000..724098df --- /dev/null +++ b/src/_h5ai/css/lib/h5bp-main-header.less @@ -0,0 +1,94 @@ +/* + * HTML5 Boilerplate + * + * What follows is the result of much research on cross-browser styling. + * Credit left inline and big thanks to Nicolas Gallagher, Jonathan Neal, + * Kroc Camen, and the H5BP dev community and team. + */ + +/* ========================================================================== + Base styles: opinionated defaults + ========================================================================== */ + +html, +button, +input, +select, +textarea { + color: #222; +} + +body { + font-size: 1em; + line-height: 1.4; +} + +/* + * Remove text-shadow in selection highlight: h5bp.com/i + * These selection declarations have to be separate. + * Customize the background color to match your design. + */ + +::-moz-selection { + background: #b3d4fc; + text-shadow: none; +} + +::selection { + background: #b3d4fc; + text-shadow: none; +} + +/* + * A better looking default horizontal rule + */ + +hr { + display: block; + height: 1px; + border: 0; + border-top: 1px solid #ccc; + margin: 1em 0; + padding: 0; +} + +/* + * Remove the gap between images and the bottom of their containers: h5bp.com/i/440 + */ + +img { + vertical-align: middle; +} + +/* + * Remove default fieldset styles. + */ + +fieldset { + border: 0; + margin: 0; + padding: 0; +} + +/* + * Allow only vertical resizing of textareas. + */ + +textarea { + resize: vertical; +} + +/* ========================================================================== + Chrome Frame prompt + ========================================================================== */ + +.chromeframe { + margin: 0.2em 0; + background: #ccc; + color: #000; + padding: 0.2em 0; +} + +/* ========================================================================== + Author's custom styles + ========================================================================== */ diff --git a/src/_h5ai/css/lib/sh/shThemeDjango.less b/src/_h5ai/css/lib/sh/shThemeDjango.less deleted file mode 100644 index d8b43134..00000000 --- a/src/_h5ai/css/lib/sh/shThemeDjango.less +++ /dev/null @@ -1,120 +0,0 @@ -/** - * SyntaxHighlighter - * http://alexgorbatchev.com/SyntaxHighlighter - * - * SyntaxHighlighter is donationware. If you are using it, please donate. - * http://alexgorbatchev.com/SyntaxHighlighter/donate.html - * - * @version - * 3.0.83 (July 02 2010) - * - * @copyright - * Copyright (C) 2004-2010 Alex Gorbatchev. - * - * @license - * Dual licensed under the MIT and GPL licenses. - */ -.syntaxhighlighter { - background-color: #0a2b1d !important; -} -.syntaxhighlighter .line.alt1 { - background-color: #0a2b1d !important; -} -.syntaxhighlighter .line.alt2 { - background-color: #0a2b1d !important; -} -.syntaxhighlighter .line.highlighted.alt1, .syntaxhighlighter .line.highlighted.alt2 { - background-color: #233729 !important; -} -.syntaxhighlighter .line.highlighted.number { - color: white !important; -} -.syntaxhighlighter table caption { - color: #f8f8f8 !important; -} -.syntaxhighlighter .gutter { - color: #497958 !important; -} -.syntaxhighlighter .gutter .line { - border-right: 3px solid #41a83e !important; -} -.syntaxhighlighter .gutter .line.highlighted { - background-color: #41a83e !important; - color: #0a2b1d !important; -} -.syntaxhighlighter.printing .line .content { - border: none !important; -} -.syntaxhighlighter.collapsed { - overflow: visible !important; -} -.syntaxhighlighter.collapsed .toolbar { - color: #96dd3b !important; - background: black !important; - border: 1px solid #41a83e !important; -} -.syntaxhighlighter.collapsed .toolbar a { - color: #96dd3b !important; -} -.syntaxhighlighter.collapsed .toolbar a:hover { - color: white !important; -} -.syntaxhighlighter .toolbar { - color: white !important; - background: #41a83e !important; - border: none !important; -} -.syntaxhighlighter .toolbar a { - color: white !important; -} -.syntaxhighlighter .toolbar a:hover { - color: #ffe862 !important; -} -.syntaxhighlighter .plain, .syntaxhighlighter .plain a { - color: #f8f8f8 !important; -} -.syntaxhighlighter .comments, .syntaxhighlighter .comments a { - color: #336442 !important; -} -.syntaxhighlighter .string, .syntaxhighlighter .string a { - color: #9df39f !important; -} -.syntaxhighlighter .keyword { - color: #96dd3b !important; -} -.syntaxhighlighter .preprocessor { - color: #91bb9e !important; -} -.syntaxhighlighter .variable { - color: #ffaa3e !important; -} -.syntaxhighlighter .value { - color: #f7e741 !important; -} -.syntaxhighlighter .functions { - color: #ffaa3e !important; -} -.syntaxhighlighter .constants { - color: #e0e8ff !important; -} -.syntaxhighlighter .script { - font-weight: bold !important; - color: #96dd3b !important; - background-color: none !important; -} -.syntaxhighlighter .color1, .syntaxhighlighter .color1 a { - color: #eb939a !important; -} -.syntaxhighlighter .color2, .syntaxhighlighter .color2 a { - color: #91bb9e !important; -} -.syntaxhighlighter .color3, .syntaxhighlighter .color3 a { - color: #edef7d !important; -} - -.syntaxhighlighter .comments { - font-style: italic !important; -} -.syntaxhighlighter .keyword { - font-weight: bold !important; -} diff --git a/src/_h5ai/css/lib/sh/shThemeEclipse.less b/src/_h5ai/css/lib/sh/shThemeEclipse.less deleted file mode 100644 index 77377d95..00000000 --- a/src/_h5ai/css/lib/sh/shThemeEclipse.less +++ /dev/null @@ -1,128 +0,0 @@ -/** - * SyntaxHighlighter - * http://alexgorbatchev.com/SyntaxHighlighter - * - * SyntaxHighlighter is donationware. If you are using it, please donate. - * http://alexgorbatchev.com/SyntaxHighlighter/donate.html - * - * @version - * 3.0.83 (July 02 2010) - * - * @copyright - * Copyright (C) 2004-2010 Alex Gorbatchev. - * - * @license - * Dual licensed under the MIT and GPL licenses. - */ -.syntaxhighlighter { - background-color: white !important; -} -.syntaxhighlighter .line.alt1 { - background-color: white !important; -} -.syntaxhighlighter .line.alt2 { - background-color: white !important; -} -.syntaxhighlighter .line.highlighted.alt1, .syntaxhighlighter .line.highlighted.alt2 { - background-color: #c3defe !important; -} -.syntaxhighlighter .line.highlighted.number { - color: white !important; -} -.syntaxhighlighter table caption { - color: black !important; -} -.syntaxhighlighter .gutter { - color: #787878 !important; -} -.syntaxhighlighter .gutter .line { - border-right: 3px solid #d4d0c8 !important; -} -.syntaxhighlighter .gutter .line.highlighted { - background-color: #d4d0c8 !important; - color: white !important; -} -.syntaxhighlighter.printing .line .content { - border: none !important; -} -.syntaxhighlighter.collapsed { - overflow: visible !important; -} -.syntaxhighlighter.collapsed .toolbar { - color: #3f5fbf !important; - background: white !important; - border: 1px solid #d4d0c8 !important; -} -.syntaxhighlighter.collapsed .toolbar a { - color: #3f5fbf !important; -} -.syntaxhighlighter.collapsed .toolbar a:hover { - color: #aa7700 !important; -} -.syntaxhighlighter .toolbar { - color: #a0a0a0 !important; - background: #d4d0c8 !important; - border: none !important; -} -.syntaxhighlighter .toolbar a { - color: #a0a0a0 !important; -} -.syntaxhighlighter .toolbar a:hover { - color: red !important; -} -.syntaxhighlighter .plain, .syntaxhighlighter .plain a { - color: black !important; -} -.syntaxhighlighter .comments, .syntaxhighlighter .comments a { - color: #3f5fbf !important; -} -.syntaxhighlighter .string, .syntaxhighlighter .string a { - color: #2a00ff !important; -} -.syntaxhighlighter .keyword { - color: #7f0055 !important; -} -.syntaxhighlighter .preprocessor { - color: #646464 !important; -} -.syntaxhighlighter .variable { - color: #aa7700 !important; -} -.syntaxhighlighter .value { - color: #009900 !important; -} -.syntaxhighlighter .functions { - color: #ff1493 !important; -} -.syntaxhighlighter .constants { - color: #0066cc !important; -} -.syntaxhighlighter .script { - font-weight: bold !important; - color: #7f0055 !important; - background-color: none !important; -} -.syntaxhighlighter .color1, .syntaxhighlighter .color1 a { - color: gray !important; -} -.syntaxhighlighter .color2, .syntaxhighlighter .color2 a { - color: #ff1493 !important; -} -.syntaxhighlighter .color3, .syntaxhighlighter .color3 a { - color: red !important; -} - -.syntaxhighlighter .keyword { - font-weight: bold !important; -} -.syntaxhighlighter .xml .keyword { - color: #3f7f7f !important; - font-weight: normal !important; -} -.syntaxhighlighter .xml .color1, .syntaxhighlighter .xml .color1 a { - color: #7f007f !important; -} -.syntaxhighlighter .xml .string { - font-style: italic !important; - color: #2a00ff !important; -} diff --git a/src/_h5ai/css/lib/sh/shThemeEmacs.less b/src/_h5ai/css/lib/sh/shThemeEmacs.less deleted file mode 100644 index dae5053f..00000000 --- a/src/_h5ai/css/lib/sh/shThemeEmacs.less +++ /dev/null @@ -1,113 +0,0 @@ -/** - * SyntaxHighlighter - * http://alexgorbatchev.com/SyntaxHighlighter - * - * SyntaxHighlighter is donationware. If you are using it, please donate. - * http://alexgorbatchev.com/SyntaxHighlighter/donate.html - * - * @version - * 3.0.83 (July 02 2010) - * - * @copyright - * Copyright (C) 2004-2010 Alex Gorbatchev. - * - * @license - * Dual licensed under the MIT and GPL licenses. - */ -.syntaxhighlighter { - background-color: black !important; -} -.syntaxhighlighter .line.alt1 { - background-color: black !important; -} -.syntaxhighlighter .line.alt2 { - background-color: black !important; -} -.syntaxhighlighter .line.highlighted.alt1, .syntaxhighlighter .line.highlighted.alt2 { - background-color: #2a3133 !important; -} -.syntaxhighlighter .line.highlighted.number { - color: white !important; -} -.syntaxhighlighter table caption { - color: #d3d3d3 !important; -} -.syntaxhighlighter .gutter { - color: #d3d3d3 !important; -} -.syntaxhighlighter .gutter .line { - border-right: 3px solid #990000 !important; -} -.syntaxhighlighter .gutter .line.highlighted { - background-color: #990000 !important; - color: black !important; -} -.syntaxhighlighter.printing .line .content { - border: none !important; -} -.syntaxhighlighter.collapsed { - overflow: visible !important; -} -.syntaxhighlighter.collapsed .toolbar { - color: #ebdb8d !important; - background: black !important; - border: 1px solid #990000 !important; -} -.syntaxhighlighter.collapsed .toolbar a { - color: #ebdb8d !important; -} -.syntaxhighlighter.collapsed .toolbar a:hover { - color: #ff7d27 !important; -} -.syntaxhighlighter .toolbar { - color: white !important; - background: #990000 !important; - border: none !important; -} -.syntaxhighlighter .toolbar a { - color: white !important; -} -.syntaxhighlighter .toolbar a:hover { - color: #9ccff4 !important; -} -.syntaxhighlighter .plain, .syntaxhighlighter .plain a { - color: #d3d3d3 !important; -} -.syntaxhighlighter .comments, .syntaxhighlighter .comments a { - color: #ff7d27 !important; -} -.syntaxhighlighter .string, .syntaxhighlighter .string a { - color: #ff9e7b !important; -} -.syntaxhighlighter .keyword { - color: aqua !important; -} -.syntaxhighlighter .preprocessor { - color: #aec4de !important; -} -.syntaxhighlighter .variable { - color: #ffaa3e !important; -} -.syntaxhighlighter .value { - color: #009900 !important; -} -.syntaxhighlighter .functions { - color: #81cef9 !important; -} -.syntaxhighlighter .constants { - color: #ff9e7b !important; -} -.syntaxhighlighter .script { - font-weight: bold !important; - color: aqua !important; - background-color: none !important; -} -.syntaxhighlighter .color1, .syntaxhighlighter .color1 a { - color: #ebdb8d !important; -} -.syntaxhighlighter .color2, .syntaxhighlighter .color2 a { - color: #ff7d27 !important; -} -.syntaxhighlighter .color3, .syntaxhighlighter .color3 a { - color: #aec4de !important; -} diff --git a/src/_h5ai/css/lib/sh/shThemeFadeToGrey.less b/src/_h5ai/css/lib/sh/shThemeFadeToGrey.less deleted file mode 100644 index 8fbd871f..00000000 --- a/src/_h5ai/css/lib/sh/shThemeFadeToGrey.less +++ /dev/null @@ -1,117 +0,0 @@ -/** - * SyntaxHighlighter - * http://alexgorbatchev.com/SyntaxHighlighter - * - * SyntaxHighlighter is donationware. If you are using it, please donate. - * http://alexgorbatchev.com/SyntaxHighlighter/donate.html - * - * @version - * 3.0.83 (July 02 2010) - * - * @copyright - * Copyright (C) 2004-2010 Alex Gorbatchev. - * - * @license - * Dual licensed under the MIT and GPL licenses. - */ -.syntaxhighlighter { - background-color: #121212 !important; -} -.syntaxhighlighter .line.alt1 { - background-color: #121212 !important; -} -.syntaxhighlighter .line.alt2 { - background-color: #121212 !important; -} -.syntaxhighlighter .line.highlighted.alt1, .syntaxhighlighter .line.highlighted.alt2 { - background-color: #2c2c29 !important; -} -.syntaxhighlighter .line.highlighted.number { - color: white !important; -} -.syntaxhighlighter table caption { - color: white !important; -} -.syntaxhighlighter .gutter { - color: #afafaf !important; -} -.syntaxhighlighter .gutter .line { - border-right: 3px solid #3185b9 !important; -} -.syntaxhighlighter .gutter .line.highlighted { - background-color: #3185b9 !important; - color: #121212 !important; -} -.syntaxhighlighter.printing .line .content { - border: none !important; -} -.syntaxhighlighter.collapsed { - overflow: visible !important; -} -.syntaxhighlighter.collapsed .toolbar { - color: #3185b9 !important; - background: black !important; - border: 1px solid #3185b9 !important; -} -.syntaxhighlighter.collapsed .toolbar a { - color: #3185b9 !important; -} -.syntaxhighlighter.collapsed .toolbar a:hover { - color: #d01d33 !important; -} -.syntaxhighlighter .toolbar { - color: white !important; - background: #3185b9 !important; - border: none !important; -} -.syntaxhighlighter .toolbar a { - color: white !important; -} -.syntaxhighlighter .toolbar a:hover { - color: #96daff !important; -} -.syntaxhighlighter .plain, .syntaxhighlighter .plain a { - color: white !important; -} -.syntaxhighlighter .comments, .syntaxhighlighter .comments a { - color: #696854 !important; -} -.syntaxhighlighter .string, .syntaxhighlighter .string a { - color: #e3e658 !important; -} -.syntaxhighlighter .keyword { - color: #d01d33 !important; -} -.syntaxhighlighter .preprocessor { - color: #435a5f !important; -} -.syntaxhighlighter .variable { - color: #898989 !important; -} -.syntaxhighlighter .value { - color: #009900 !important; -} -.syntaxhighlighter .functions { - color: #aaaaaa !important; -} -.syntaxhighlighter .constants { - color: #96daff !important; -} -.syntaxhighlighter .script { - font-weight: bold !important; - color: #d01d33 !important; - background-color: none !important; -} -.syntaxhighlighter .color1, .syntaxhighlighter .color1 a { - color: #ffc074 !important; -} -.syntaxhighlighter .color2, .syntaxhighlighter .color2 a { - color: #4a8cdb !important; -} -.syntaxhighlighter .color3, .syntaxhighlighter .color3 a { - color: #96daff !important; -} - -.syntaxhighlighter .functions { - font-weight: bold !important; -} diff --git a/src/_h5ai/css/lib/sh/shThemeMDUltra.less b/src/_h5ai/css/lib/sh/shThemeMDUltra.less deleted file mode 100755 index f4db39cd..00000000 --- a/src/_h5ai/css/lib/sh/shThemeMDUltra.less +++ /dev/null @@ -1,113 +0,0 @@ -/** - * SyntaxHighlighter - * http://alexgorbatchev.com/SyntaxHighlighter - * - * SyntaxHighlighter is donationware. If you are using it, please donate. - * http://alexgorbatchev.com/SyntaxHighlighter/donate.html - * - * @version - * 3.0.83 (July 02 2010) - * - * @copyright - * Copyright (C) 2004-2010 Alex Gorbatchev. - * - * @license - * Dual licensed under the MIT and GPL licenses. - */ -.syntaxhighlighter { - background-color: #222222 !important; -} -.syntaxhighlighter .line.alt1 { - background-color: #222222 !important; -} -.syntaxhighlighter .line.alt2 { - background-color: #222222 !important; -} -.syntaxhighlighter .line.highlighted.alt1, .syntaxhighlighter .line.highlighted.alt2 { - background-color: #253e5a !important; -} -.syntaxhighlighter .line.highlighted.number { - color: white !important; -} -.syntaxhighlighter table caption { - color: lime !important; -} -.syntaxhighlighter .gutter { - color: #38566f !important; -} -.syntaxhighlighter .gutter .line { - border-right: 3px solid #435a5f !important; -} -.syntaxhighlighter .gutter .line.highlighted { - background-color: #435a5f !important; - color: #222222 !important; -} -.syntaxhighlighter.printing .line .content { - border: none !important; -} -.syntaxhighlighter.collapsed { - overflow: visible !important; -} -.syntaxhighlighter.collapsed .toolbar { - color: #428bdd !important; - background: black !important; - border: 1px solid #435a5f !important; -} -.syntaxhighlighter.collapsed .toolbar a { - color: #428bdd !important; -} -.syntaxhighlighter.collapsed .toolbar a:hover { - color: lime !important; -} -.syntaxhighlighter .toolbar { - color: #aaaaff !important; - background: #435a5f !important; - border: none !important; -} -.syntaxhighlighter .toolbar a { - color: #aaaaff !important; -} -.syntaxhighlighter .toolbar a:hover { - color: #9ccff4 !important; -} -.syntaxhighlighter .plain, .syntaxhighlighter .plain a { - color: lime !important; -} -.syntaxhighlighter .comments, .syntaxhighlighter .comments a { - color: #428bdd !important; -} -.syntaxhighlighter .string, .syntaxhighlighter .string a { - color: lime !important; -} -.syntaxhighlighter .keyword { - color: #aaaaff !important; -} -.syntaxhighlighter .preprocessor { - color: #8aa6c1 !important; -} -.syntaxhighlighter .variable { - color: aqua !important; -} -.syntaxhighlighter .value { - color: #f7e741 !important; -} -.syntaxhighlighter .functions { - color: #ff8000 !important; -} -.syntaxhighlighter .constants { - color: yellow !important; -} -.syntaxhighlighter .script { - font-weight: bold !important; - color: #aaaaff !important; - background-color: none !important; -} -.syntaxhighlighter .color1, .syntaxhighlighter .color1 a { - color: red !important; -} -.syntaxhighlighter .color2, .syntaxhighlighter .color2 a { - color: yellow !important; -} -.syntaxhighlighter .color3, .syntaxhighlighter .color3 a { - color: #ffaa3e !important; -} diff --git a/src/_h5ai/css/lib/sh/shThemeMidnight.less b/src/_h5ai/css/lib/sh/shThemeMidnight.less deleted file mode 100644 index c49563cc..00000000 --- a/src/_h5ai/css/lib/sh/shThemeMidnight.less +++ /dev/null @@ -1,113 +0,0 @@ -/** - * SyntaxHighlighter - * http://alexgorbatchev.com/SyntaxHighlighter - * - * SyntaxHighlighter is donationware. If you are using it, please donate. - * http://alexgorbatchev.com/SyntaxHighlighter/donate.html - * - * @version - * 3.0.83 (July 02 2010) - * - * @copyright - * Copyright (C) 2004-2010 Alex Gorbatchev. - * - * @license - * Dual licensed under the MIT and GPL licenses. - */ -.syntaxhighlighter { - background-color: #0f192a !important; -} -.syntaxhighlighter .line.alt1 { - background-color: #0f192a !important; -} -.syntaxhighlighter .line.alt2 { - background-color: #0f192a !important; -} -.syntaxhighlighter .line.highlighted.alt1, .syntaxhighlighter .line.highlighted.alt2 { - background-color: #253e5a !important; -} -.syntaxhighlighter .line.highlighted.number { - color: #38566f !important; -} -.syntaxhighlighter table caption { - color: #d1edff !important; -} -.syntaxhighlighter .gutter { - color: #afafaf !important; -} -.syntaxhighlighter .gutter .line { - border-right: 3px solid #435a5f !important; -} -.syntaxhighlighter .gutter .line.highlighted { - background-color: #435a5f !important; - color: #0f192a !important; -} -.syntaxhighlighter.printing .line .content { - border: none !important; -} -.syntaxhighlighter.collapsed { - overflow: visible !important; -} -.syntaxhighlighter.collapsed .toolbar { - color: #428bdd !important; - background: black !important; - border: 1px solid #435a5f !important; -} -.syntaxhighlighter.collapsed .toolbar a { - color: #428bdd !important; -} -.syntaxhighlighter.collapsed .toolbar a:hover { - color: #1dc116 !important; -} -.syntaxhighlighter .toolbar { - color: #d1edff !important; - background: #435a5f !important; - border: none !important; -} -.syntaxhighlighter .toolbar a { - color: #d1edff !important; -} -.syntaxhighlighter .toolbar a:hover { - color: #8aa6c1 !important; -} -.syntaxhighlighter .plain, .syntaxhighlighter .plain a { - color: #d1edff !important; -} -.syntaxhighlighter .comments, .syntaxhighlighter .comments a { - color: #428bdd !important; -} -.syntaxhighlighter .string, .syntaxhighlighter .string a { - color: #1dc116 !important; -} -.syntaxhighlighter .keyword { - color: #b43d3d !important; -} -.syntaxhighlighter .preprocessor { - color: #8aa6c1 !important; -} -.syntaxhighlighter .variable { - color: #ffaa3e !important; -} -.syntaxhighlighter .value { - color: #f7e741 !important; -} -.syntaxhighlighter .functions { - color: #ffaa3e !important; -} -.syntaxhighlighter .constants { - color: #e0e8ff !important; -} -.syntaxhighlighter .script { - font-weight: bold !important; - color: #b43d3d !important; - background-color: none !important; -} -.syntaxhighlighter .color1, .syntaxhighlighter .color1 a { - color: #f8bb00 !important; -} -.syntaxhighlighter .color2, .syntaxhighlighter .color2 a { - color: white !important; -} -.syntaxhighlighter .color3, .syntaxhighlighter .color3 a { - color: #ffaa3e !important; -} diff --git a/src/_h5ai/css/lib/sh/shThemeRDark.less b/src/_h5ai/css/lib/sh/shThemeRDark.less deleted file mode 100644 index 6305a10e..00000000 --- a/src/_h5ai/css/lib/sh/shThemeRDark.less +++ /dev/null @@ -1,113 +0,0 @@ -/** - * SyntaxHighlighter - * http://alexgorbatchev.com/SyntaxHighlighter - * - * SyntaxHighlighter is donationware. If you are using it, please donate. - * http://alexgorbatchev.com/SyntaxHighlighter/donate.html - * - * @version - * 3.0.83 (July 02 2010) - * - * @copyright - * Copyright (C) 2004-2010 Alex Gorbatchev. - * - * @license - * Dual licensed under the MIT and GPL licenses. - */ -.syntaxhighlighter { - background-color: #1b2426 !important; -} -.syntaxhighlighter .line.alt1 { - background-color: #1b2426 !important; -} -.syntaxhighlighter .line.alt2 { - background-color: #1b2426 !important; -} -.syntaxhighlighter .line.highlighted.alt1, .syntaxhighlighter .line.highlighted.alt2 { - background-color: #323e41 !important; -} -.syntaxhighlighter .line.highlighted.number { - color: #b9bdb6 !important; -} -.syntaxhighlighter table caption { - color: #b9bdb6 !important; -} -.syntaxhighlighter .gutter { - color: #afafaf !important; -} -.syntaxhighlighter .gutter .line { - border-right: 3px solid #435a5f !important; -} -.syntaxhighlighter .gutter .line.highlighted { - background-color: #435a5f !important; - color: #1b2426 !important; -} -.syntaxhighlighter.printing .line .content { - border: none !important; -} -.syntaxhighlighter.collapsed { - overflow: visible !important; -} -.syntaxhighlighter.collapsed .toolbar { - color: #5ba1cf !important; - background: black !important; - border: 1px solid #435a5f !important; -} -.syntaxhighlighter.collapsed .toolbar a { - color: #5ba1cf !important; -} -.syntaxhighlighter.collapsed .toolbar a:hover { - color: #5ce638 !important; -} -.syntaxhighlighter .toolbar { - color: white !important; - background: #435a5f !important; - border: none !important; -} -.syntaxhighlighter .toolbar a { - color: white !important; -} -.syntaxhighlighter .toolbar a:hover { - color: #e0e8ff !important; -} -.syntaxhighlighter .plain, .syntaxhighlighter .plain a { - color: #b9bdb6 !important; -} -.syntaxhighlighter .comments, .syntaxhighlighter .comments a { - color: #878a85 !important; -} -.syntaxhighlighter .string, .syntaxhighlighter .string a { - color: #5ce638 !important; -} -.syntaxhighlighter .keyword { - color: #5ba1cf !important; -} -.syntaxhighlighter .preprocessor { - color: #435a5f !important; -} -.syntaxhighlighter .variable { - color: #ffaa3e !important; -} -.syntaxhighlighter .value { - color: #009900 !important; -} -.syntaxhighlighter .functions { - color: #ffaa3e !important; -} -.syntaxhighlighter .constants { - color: #e0e8ff !important; -} -.syntaxhighlighter .script { - font-weight: bold !important; - color: #5ba1cf !important; - background-color: none !important; -} -.syntaxhighlighter .color1, .syntaxhighlighter .color1 a { - color: #e0e8ff !important; -} -.syntaxhighlighter .color2, .syntaxhighlighter .color2 a { - color: white !important; -} -.syntaxhighlighter .color3, .syntaxhighlighter .color3 a { - color: #ffaa3e !important; -} diff --git a/src/_h5ai/css/styles.less b/src/_h5ai/css/styles.less index 39a97d4f..25a8fbb2 100644 --- a/src/_h5ai/css/styles.less +++ b/src/_h5ai/css/styles.less @@ -1,16 +1,22 @@ @import "lib/h5bp-normalize"; -@import "lib/h5bp-main"; +@import "lib/h5bp-main-header"; + @import "lib/mixins"; @import "lib/sh/shCore"; @import "lib/sh/shThemeDefault"; @import "inc/general"; - @import "inc/topbar"; +@import "inc/bottombar"; @import "inc/download"; @import "inc/delete"; @import "inc/filter"; +@import "inc/l10n"; +@import "inc/tree"; +@import "inc/qrcode"; +@import "inc/preview-img"; +@import "inc/preview-txt"; @import "inc/content"; @import "inc/extended"; @@ -18,19 +24,12 @@ @import "inc/extended-icons"; @import "inc/extended-list"; @import "inc/extended-grid"; -@import "inc/context-menu"; +// @import "inc/context-menu"; @import "inc/dropbox"; - -@import "inc/bottombar"; -@import "inc/l10n"; - -@import "inc/tree"; -@import "inc/context"; @import "inc/apache-autoindex-table"; -@import "inc/preview-img"; -@import "inc/preview-txt"; - @import "inc/responsive"; @import "inc/h5ai-info"; + +@import "lib/h5bp-main-footer"; diff --git a/src/_h5ai/js/inc/ext/qrcode.js b/src/_h5ai/js/inc/ext/qrcode.js index cdd183b0..0c6a2106 100644 --- a/src/_h5ai/js/inc/ext/qrcode.js +++ b/src/_h5ai/js/inc/ext/qrcode.js @@ -8,13 +8,13 @@ modulejs.define('ext/qrcode', ['_', '$', 'modernizr', 'core/settings', 'core/eve settings = _.extend({}, defaults, allsettings.qrcode), - template = '
', + template = '
', - $context, hideTimeoutId, + $qrcode, hideTimeoutId, update = function (entry) { - $context.find('.qrcode').empty().qrcode({ + $qrcode.empty().qrcode({ render: modernizr.canvas ? 'canvas' : 'div', width: settings.size, height: settings.size, @@ -28,7 +28,7 @@ modulejs.define('ext/qrcode', ['_', '$', 'modernizr', 'core/settings', 'core/eve if (!entry.isFolder()) { update(entry); clearTimeout(hideTimeoutId); - $context.stop(true, true).fadeIn(400); + $qrcode.stop(true, true).fadeIn(400); } }, @@ -36,7 +36,7 @@ modulejs.define('ext/qrcode', ['_', '$', 'modernizr', 'core/settings', 'core/eve hideTimeoutId = setTimeout(function () { - $context.stop(true, true).fadeOut(400); + $qrcode.stop(true, true).fadeOut(400); }, 200); }, @@ -46,7 +46,7 @@ modulejs.define('ext/qrcode', ['_', '$', 'modernizr', 'core/settings', 'core/eve return; } - $context = $(template).appendTo('body'); + $qrcode = $(template).appendTo('body'); event.sub('entry.mouseenter', onMouseenter); event.sub('entry.mouseleave', onMouseleave);