From 6c4e0067ba8269f7606fdfa35cb46e36b4e9e5df Mon Sep 17 00:00:00 2001 From: ARvind Tiwari Date: Tue, 8 Aug 2017 00:35:58 +0530 Subject: [PATCH 1/3] font-family changed to 'Lato' in all css files --- .../datacenterlight/css/landing-page.css | 52 +++++++++++------- hosting/static/hosting/css/commons.css | 3 +- hosting/static/hosting/css/landing-page.css | 19 ++++--- hosting/static/hosting/css/pricing.css | 2 +- hosting/static/hosting/css/user_keys.css | 53 ++++++++++--------- 5 files changed, 77 insertions(+), 52 deletions(-) diff --git a/datacenterlight/static/datacenterlight/css/landing-page.css b/datacenterlight/static/datacenterlight/css/landing-page.css index 6c813661..c693247c 100755 --- a/datacenterlight/static/datacenterlight/css/landing-page.css +++ b/datacenterlight/static/datacenterlight/css/landing-page.css @@ -4,10 +4,10 @@ * For details, see http://www.apache.org/licenses/LICENSE-2.0. */ -@font-face { +/*@font-face { font-family: 'Lato-Light'; src: url('../fonts/Lato/Lato-Light.ttf'); -} +}*/ body, html { @@ -22,7 +22,12 @@ h3, h4, h5, h6 { - font-family: 'Lato-Light', sans-serif; + /*font-family: 'Lato-Light', sans-serif;*/ + font-family: 'Lato', sans-serif; + font-weight: 300; +} + +button, input, optgroup, select, textarea { font-weight: 300; } @@ -143,13 +148,15 @@ h6 { .navbar-default .navbar-nav>li>a { cursor: pointer; - font-family: 'Lato-Light', sans-serif; + /*font-family: 'Lato-Light', sans-serif;*/ + font-weight: 300; } .navbar-transparent .navbar-nav>li>a { color: #fff; cursor: pointer; - font-family: 'Lato-Light', sans-serif; + /*font-family: 'Lato-Light', sans-serif;*/ + font-weight: 300; } .navbar-transparent .navbar-nav>li>a:hover { @@ -202,13 +209,15 @@ h6 { .navbar-transparent .nav-language .select-language { color: #fff; - font-family: 'Lato-Light', sans-serif; + /*font-family: 'Lato-Light', sans-serif;*/ + font-weight: 300; } .nav-language .select-language span { margin-left: 5px; margin-right: 5px; - font-family: 'Lato', sans-serif; + /*font-family: 'Lato', sans-serif;*/ + font-weight: normal; } .nav-language .drop-language{ /*position: absolute;*/ @@ -237,7 +246,8 @@ h6 { .nav-language .drop-language a{ cursor: pointer; padding: 5px 10px !important; - font-family: 'Lato-Light', sans-serif; + /*font-family: 'Lato-Light', sans-serif;*/ + font-weight: 300; } /* Show the dropdown menu on hover */ @@ -260,7 +270,8 @@ h6 { .navbar-transparent .nav-language .drop-language a { color: #fff; padding: 5px 10px !important; - font-family: 'Lato-Light', sans-serif; + /*font-family: 'Lato-Light', sans-serif;*/ + font-weight: 300; } /* .nav-language:hover .drop-language{ display: block; @@ -343,7 +354,7 @@ h6 { .intro-message>h1 { margin: 0; - font-weight: 400; + font-weight: 300; font-size: 6em; } @@ -792,7 +803,8 @@ tech-sub-sec h2 { } .percent-text { - font-family: 'Lato', sans-serif; + /*font-family: 'Lato', sans-serif;*/ +/* font-weight: normal; */ font-size: 50px; color: #999; } @@ -879,7 +891,7 @@ tech-sub-sec h2 { .dropdown-menu>li>a { font-size: 13px; font-weight: 300; - font-family: 'Lato-Light', sans-serif; + /*font-family: 'Lato-Light', sans-serif;*/ } .navbar-default .navbar-nav>.active>a, @@ -898,7 +910,8 @@ tech-sub-sec h2 { background: -webkit-linear-gradient(top, #f0f4f7, #fff) no-repeat; background: linear-gradient(to bottom, #f0f4f7, #fff) no-repeat; display: flex; - font-family: 'Lato', sans-serif; + /*font-family: 'Lato', sans-serif;*/ +/* font-weight: normal; */ } .price-calc-section .text { @@ -963,7 +976,8 @@ tech-sub-sec h2 { } .price-calc-section .card .title h3 { - font-family: 'Lato', sans-serif; + /*font-family: 'Lato', sans-serif;*/ + font-weight: normal; } .price-calc-section .card .price { @@ -1050,8 +1064,9 @@ tech-sub-sec h2 { .price-calc-section .card .description.input label { font-size: 15px; - font-weight: 800; - font-family: 'Lato'; + font-weight: 700; + /*font-weight: 800;*/ + /*font-family: 'Lato';*/ margin-bottom: 0; width: 40px; } @@ -1364,7 +1379,8 @@ tech-sub-sec h2 { padding: 30px; } .percent-text { - font-family: 'Lato'; + /*font-family: 'Lato';*/ + font-weight: normal; font-size: 37px; /* text-align: center; */ } @@ -1402,7 +1418,7 @@ tech-sub-sec h2 { .network-name { text-transform: uppercase; font-size: 14px; - font-weight: 400; + font-weight: 300; letter-spacing: 2px; } diff --git a/hosting/static/hosting/css/commons.css b/hosting/static/hosting/css/commons.css index 79053e4e..2dd5637a 100644 --- a/hosting/static/hosting/css/commons.css +++ b/hosting/static/hosting/css/commons.css @@ -115,7 +115,8 @@ line-height: 1.42857143; font-size: 25px; padding: 0; - font-family: 'Lato', sans-serif; + /*font-family: 'Lato', sans-serif;*/ + font-weight: normal; } .modal-text { padding-top: 15px; diff --git a/hosting/static/hosting/css/landing-page.css b/hosting/static/hosting/css/landing-page.css index d17ef8f2..ee9fea36 100644 --- a/hosting/static/hosting/css/landing-page.css +++ b/hosting/static/hosting/css/landing-page.css @@ -4,7 +4,7 @@ * For details, see http://www.apache.org/licenses/LICENSE-2.0. */ -@font-face { +/*@font-face { font-family: 'Lato-Regular'; src: url('../fonts/Lato/Lato-Regular.ttf'); } @@ -16,7 +16,7 @@ @font-face { font-family: 'Lato-Light'; src: url('../fonts/Lato/Lato-Light.ttf'); -} +}*/ body, html { @@ -31,7 +31,8 @@ h3, h4, h5, h6 { - font-family: 'Lato-Regular', sans-serif; + /*font-family: 'Lato-Regular', sans-serif;*/ + font-family: 'Lato', sans-serif; font-weight: 300; } @@ -53,7 +54,8 @@ h6 { .navbar-transparent .navbar-nav>li>a { color: #fff; cursor: pointer; - font-family: 'Lato-Regular', sans-serif; + /*font-family: 'Lato-Regular', sans-serif;*/ + font-weight: normal; } .navbar-transparent .navbar-nav>li>a:hover { color: #fff; @@ -376,7 +378,8 @@ h6 { text-align: center; font-size: 18px; line-height: 30px; - font-family: 'Lato' !important; + /*font-family: 'Lato' !important;*/ + font-weight: normal !important; } .sign-up-message a { @@ -488,7 +491,8 @@ a.unlink:hover { /***** DCL payment page **********/ .dcl-order-container { - font-family: Lato; + /*font-family: Lato;*/ + font-weight: normal; } .dcl-order-table-header { @@ -547,7 +551,8 @@ a.unlink:hover { } .card-warning-content { - font-family: Lato; + /*font-family: Lato;*/ + font-weight: normal; border: 1px solid #a1a1a1; border-radius: 3px; padding: 5px; diff --git a/hosting/static/hosting/css/pricing.css b/hosting/static/hosting/css/pricing.css index 8eba7ffa..3c952209 100644 --- a/hosting/static/hosting/css/pricing.css +++ b/hosting/static/hosting/css/pricing.css @@ -9,7 +9,7 @@ font-size: 14px; padding-left: 0; margin-bottom: 30px; - font-family: 'Lato'; + font-family: Lato, sans-serif; } diff --git a/hosting/static/hosting/css/user_keys.css b/hosting/static/hosting/css/user_keys.css index 77a12155..a3d4526a 100644 --- a/hosting/static/hosting/css/user_keys.css +++ b/hosting/static/hosting/css/user_keys.css @@ -1,6 +1,6 @@ /* ssh_keys_choice */ .h1-thin { - font-family: Lato, sans-serif; + /*font-family: Lato, sans-serif;*/ font-weight: 300; font-size: 32px; } @@ -10,12 +10,12 @@ } .dashboard-choice-container .page-header p { font-size: 16px; - font-family: Lato, sans-serif; + /*font-family: Lato, sans-serif;*/ font-weight: 300; } .dashboard-choice-container h2 { - font-family: Lato, sans-serif; - font-weight: 400; + /*font-family: Lato, sans-serif; + font-weight: 400;*/ font-size: 22px; margin-top: 0; } @@ -26,7 +26,7 @@ } .choice-container p{ font-size: 18px; - font-family: Lato, sans-serif; + /*font-family: Lato, sans-serif;*/ font-weight: 300; } .choice-container-top { @@ -119,7 +119,7 @@ color: #717274; font-size: 16px; font-weight: 300; - font-family: 'Lato'; + /*font-family: 'Lato';*/ } .borderless tbody:before { @@ -195,7 +195,8 @@ border-bottom: 1px solid grey; box-shadow: none; border-radius: 0; - font-family: 'Lato-Light', sans-serif; + /*font-family: 'Lato-Light', sans-serif;*/ + font-weight: 300; font-size: 20px; padding-left: 0; } @@ -203,57 +204,58 @@ .form_key_name::-webkit-input-placeholder{ font-size: 20px; font-weight:100; - font-family: 'Lato-Light', sans-serif; + /*font-family: 'Lato-Light', sans-serif;*/ + font-weight: 300; } .form_key_name::-moz-input-placeholder{ font-size: 20px; - font-weight:200; - font-family: 'Lato-Light', sans-serif; + /*font-family: 'Lato-Light', sans-serif;*/ + font-weight: 300; } .form_key_name:-moz-input-placeholder{ - font-family: 'Lato-Light', sans-serif; + /*font-family: 'Lato-Light', sans-serif;*/ + font-weight: 300; font-size: 20px; - font-weight:200; } .form_key_name:-ms-input-placeholder { font-size: 20px; - font-family: 'Lato-Light', sans-serif; - font-weight:200; + /*font-family: 'Lato-Light', sans-serif;*/ + font-weight: 300; } .form_public_key::-webkit-input-placeholder{ position: relative; top: 110px; font-size: 20px; - font-weight: 200; - font-family: 'Lato-Light', sans-serif; + /*font-family: 'Lato-Light', sans-serif;*/ + font-weight: 300; } .form_public_key::-moz-input-placeholder{ position: relative; top: 110px; font-size: 20px; - font-family: 'Lato-Light', sans-serif; - font-weight:200; + /*font-family: 'Lato-Light', sans-serif;*/ + font-weight: 300; } .form_public_key:-moz-input-placeholder{ position: relative; top: 110px; font-size: 20px; - font-weight:200; - font-family: 'Lato-Light', sans-serif; + /*font-family: 'Lato-Light', sans-serif;*/ + font-weight: 300; } .form_public_key:-ms-input-placeholder { position: relative; top: 110px; font-size: 20px; - font-weight:200; - font-family: 'Lato-Light', sans-serif; + /*font-family: 'Lato-Light', sans-serif;*/ + font-weight: 300; } .underform-contaner{ margin-bottom: 20px; @@ -273,7 +275,8 @@ } } .underform-contaner h4{ - font-family: 'Lato-Light', sans-serif; + /*font-family: 'Lato-Light', sans-serif;*/ + font-weight: 300; } .underform-contaner button{ /* font-family: Lato; */ @@ -287,9 +290,9 @@ color: #fff; } .control-label{ - font-family: 'Lato-Light', sans-serif; + /*font-family: 'Lato-Light', sans-serif;*/ + font-weight: 300; font-size: 20px; - font-weight:200; } .form-ssh h3{ margin-bottom: 40px; From cc58c494573b4f49abe866257b6125cbff3cfdbb Mon Sep 17 00:00:00 2001 From: ARvind Tiwari Date: Tue, 8 Aug 2017 00:51:54 +0530 Subject: [PATCH 2/3] font-weight fix in hosting app --- hosting/static/hosting/css/landing-page.css | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/hosting/static/hosting/css/landing-page.css b/hosting/static/hosting/css/landing-page.css index ee9fea36..600ee20c 100644 --- a/hosting/static/hosting/css/landing-page.css +++ b/hosting/static/hosting/css/landing-page.css @@ -33,7 +33,7 @@ h5, h6 { /*font-family: 'Lato-Regular', sans-serif;*/ font-family: 'Lato', sans-serif; - font-weight: 300; + /*font-weight: 300;*/ } .topnav { @@ -379,7 +379,7 @@ h6 { font-size: 18px; line-height: 30px; /*font-family: 'Lato' !important;*/ - font-weight: normal !important; + font-weight: 300 !important; } .sign-up-message a { @@ -492,7 +492,7 @@ a.unlink:hover { /***** DCL payment page **********/ .dcl-order-container { /*font-family: Lato;*/ - font-weight: normal; + font-weight: 300; } .dcl-order-table-header { @@ -552,7 +552,7 @@ a.unlink:hover { .card-warning-content { /*font-family: Lato;*/ - font-weight: normal; + font-weight: 300; border: 1px solid #a1a1a1; border-radius: 3px; padding: 5px; From ac0787bdd597979830bd9fbdbe27d04f3237e34f Mon Sep 17 00:00:00 2001 From: ARvind Tiwari Date: Tue, 8 Aug 2017 23:01:19 +0530 Subject: [PATCH 3/3] modal title font-weight and capitalization fix --- hosting/locale/de/LC_MESSAGES/django.po | 2 +- hosting/static/hosting/css/commons.css | 5 ++++- hosting/templates/hosting/user_keys.html | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/hosting/locale/de/LC_MESSAGES/django.po b/hosting/locale/de/LC_MESSAGES/django.po index 0e777a19..4b886cae 100644 --- a/hosting/locale/de/LC_MESSAGES/django.po +++ b/hosting/locale/de/LC_MESSAGES/django.po @@ -393,7 +393,7 @@ msgstr "" msgid "Delete SSH Key" msgstr "SSH Key löschen" -msgid "Do You want to delete this key?" +msgid "Do you want to delete this key?" msgstr "Möchtest Du den Schlüssel löschen?" msgid "Show" diff --git a/hosting/static/hosting/css/commons.css b/hosting/static/hosting/css/commons.css index 2dd5637a..2b147f8b 100644 --- a/hosting/static/hosting/css/commons.css +++ b/hosting/static/hosting/css/commons.css @@ -110,13 +110,16 @@ font-weight: 100; color: #999; } +.modal-body .modal-icon { + margin-bottom: 10px; +} .modal-title { margin: 0; line-height: 1.42857143; font-size: 25px; padding: 0; /*font-family: 'Lato', sans-serif;*/ - font-weight: normal; + font-weight: 300; } .modal-text { padding-top: 15px; diff --git a/hosting/templates/hosting/user_keys.html b/hosting/templates/hosting/user_keys.html index 2125bd9f..dcb04c83 100644 --- a/hosting/templates/hosting/user_keys.html +++ b/hosting/templates/hosting/user_keys.html @@ -50,7 +50,7 @@
-

{% trans "Do You want to delete this key?"%}

+

{% trans "Do you want to delete this key?"%}

{% csrf_token %}