From 866d51be14dd57508bfd7c7b1934d71eff25f92f Mon Sep 17 00:00:00 2001 From: opi Date: Thu, 13 Nov 2014 18:50:40 +0100 Subject: [PATCH] [enh] Massive cleanup. --- portal/assets/css/ynh-style.css | 60 +++++++++++---------------------- portal/assets/css/ynhpanel.css | 42 +++++++++++------------ portal/assets/js/ynhpanel.js | 4 +-- portal/edit.html | 18 +++++----- portal/info.html | 6 ++-- portal/login.html | 4 +-- portal/password.html | 8 ++--- 7 files changed, 59 insertions(+), 83 deletions(-) diff --git a/portal/assets/css/ynh-style.css b/portal/assets/css/ynh-style.css index 04e1b54..11049ab 100644 --- a/portal/assets/css/ynh-style.css +++ b/portal/assets/css/ynh-style.css @@ -126,26 +126,6 @@ img { .wrapper:after {clear: both;} -.col { - letter-spacing: -5px; /*fix bug ff PC*/ -} - -.col > * { - display: inline-block; - vertical-align: top; - letter-spacing: normal; -} - -.colMarge > * { - margin-left: 1%; -} - -.colNomarge > * { - margin-left: 0; -} - - - /* Logo */ .logo { @@ -236,19 +216,6 @@ textarea { } -.sourcePro { - font-family: 'source_sans_proregular'; -} - -.sourceProBold { - font-family: 'source_sans_probold'; -} - -.sourceProBlack { - font-family: 'SourceSansPro-Black'; -} - - /* Icons */ [class^="icon-"]:before, [class*=" icon-"]:before { @@ -281,16 +248,17 @@ textarea { .apps { margin: 4% 5%; } -.first-letter:before { - content: attr(data-first-letter); -} - .listing-apps { margin: 0; padding: 0; + letter-spacing: -5px; /*fix bug ff PC*/ + font-family: 'source_sans_probold'; } .listing-apps li { + display: inline-block; + vertical-align: top; + letter-spacing: normal; list-style: none; margin: 0 0 1em 1em; box-shadow: 2px 2px 3px rgba(0, 0, 0, 0.4), @@ -364,9 +332,16 @@ textarea { .listing-apps span { display: block; margin: -1.2em 0 0 0.2em; -} +} .listing-apps .first-letter { margin: 0; } - .listing-apps span + span { font-size: 0.3em; } + .listing-apps .first-letter:before { + content: attr(data-first-letter); + display: inline-block; + } + .listing-apps .name { + font-family: 'source_sans_proregular'; + font-size: 0.3em; + } @media screen and (max-width: 450px) { .apps {margin: 10% 5%;} @@ -493,10 +468,15 @@ textarea { margin-top: -0.2em; } - +/* User menu */ .user-menu { float: right; + margin: 0; + padding: 0; } + .user-menu li { + list-style: none; + } .user-menu a { color: #999; display: block; diff --git a/portal/assets/css/ynhpanel.css b/portal/assets/css/ynhpanel.css index 68d5b19..b5c074c 100644 --- a/portal/assets/css/ynhpanel.css +++ b/portal/assets/css/ynhpanel.css @@ -129,14 +129,6 @@ body {/*overflow-y: scroll;*/} #ynhoverlay li { list-style-type: none; } -#ynhoverlay .col { letter-spacing: -5px; } - -#ynhoverlay .col > * { - display: inline-block; - letter-spacing: normal; - vertical-align: top; -} - #ynhoverlay img { max-width: 100%; height: auto; @@ -144,13 +136,6 @@ body {/*overflow-y: scroll;*/} #ynhoverlay a { text-decoration: none; } -#ynhoverlay .sourcePro { - font-family: 'source_sans_proregular'; -} - -#ynhoverlay .sourceProBold { - font-family: 'source_sans_probold'; -} #ynhoverlay .wrapper { width: 90%; @@ -267,16 +252,20 @@ body {/*overflow-y: scroll;*/} #ynhoverlay .apps { margin: 4% 5%; } -#ynhoverlay .listing-apps { letter-spacing: -5px; } - -#ynhoverlay .listing-apps .first-letter:before { - content: attr(data-first-letter); +#ynhoverlay .listing-apps { + margin: 0; + padding: 0; + letter-spacing: -5px; + font-family: 'source_sans_probold'; } #ynhoverlay .listing-apps li { margin: 0 0 1em 1em; box-shadow: 2px 2px 3px rgba(0, 0, 0, 0.4), -2px -2px 3px 0 rgba(0, 0, 0, 0.7) inset; + display: inline-block; + letter-spacing: normal; + vertical-align: top; } #ynhoverlay .listing-apps a { @@ -351,13 +340,20 @@ body {/*overflow-y: scroll;*/} display: block; margin: -1.2em 0 0 0.2em; } +#ynhoverlay .listing-apps .first-letter:before { + content: attr(data-first-letter); + display: inline-block; +} #ynhoverlay .listing-apps .first-letter { margin: 0; } - #ynhoverlay .listing-apps span + span { font-size: 0.3em; } + #ynhoverlay .listing-apps .name { + font-family: 'source_sans_proregular'; + font-size: 0.3em; + } @media screen and (max-width: 470px) { #ynhoverlay .apps {margin: 10% 5% 20% 5%;} #ynhoverlay .listing-apps a {font-size: 3em;} - #ynhoverlay .listing-apps span + span { font-size: 0.32em; } + #ynhoverlay .listing-apps .name { font-size: 0.32em; } #ynhoverlay .listing-apps a:hover, #ynhoverlay .listing-apps a:focus {left: -5px;top: -5px;} #ynhoverlay .listing-apps a:hover:before, @@ -533,7 +529,7 @@ body {/*overflow-y: scroll;*/} 5 = Color ========================================================================== */ -#ynhoverlay .listing-apps { +#ynhoverlay .listing-apps { transition: all 0.2s ease 0s; -moz-transition: all 0.2s ease 0s; -webkit-transition: all 0.2s ease 0s; @@ -726,7 +722,7 @@ body {/*overflow-y: scroll;*/} ========================================================================== */ @media screen and (max-width: 500px) { - #ynhoverlay .listing-apps span + span { font-size: 0.33em; } + #ynhoverlay .listing-apps .name { font-size: 0.33em; } #ynhoverlay .user-menu { float: none; } #ynhoverlay .user-menu a { padding: 0 1em; } diff --git a/portal/assets/js/ynhpanel.js b/portal/assets/js/ynhpanel.js index 4401042..a6088a8 100644 --- a/portal/assets/js/ynhpanel.js +++ b/portal/assets/js/ynhpanel.js @@ -181,9 +181,9 @@ domReady(function(){ // Add application links var links = []; Array.prototype.forEach.call(response.app, function(app, n){ - links.push('
  • '+app.name+'
    • '); + links.push('
  • '+app.name+'
    • '); }); - overlay.innerHTML += '
    '; + overlay.innerHTML += '
    '; // Add footer links overlay.innerHTML += ' diff --git a/portal/info.html b/portal/info.html index 3945acc..6946789 100644 --- a/portal/info.html +++ b/portal/info.html @@ -1,5 +1,5 @@
    -
    -
    diff --git a/portal/login.html b/portal/login.html index 2ca09fa..bb6b968 100644 --- a/portal/login.html +++ b/portal/login.html @@ -2,11 +2,11 @@
    - +
    - +
    diff --git a/portal/password.html b/portal/password.html index 59f6f8c..282fa85 100644 --- a/portal/password.html +++ b/portal/password.html @@ -1,5 +1,5 @@
    -