ungleich-public
/
dynamicweb
6
0
Fork 0
Code Issues 1 Pull Requests 2 Projects Releases Wiki Activity

Merge pull request #440 from tiwariav/task/3619/lato-font 

Task/3619 Lato font used in all stylesheets
This commit is contained in:
Arvind Tiwari 2017-08-12 00:42:37 +05:30 committed by GitHub
parent 415c914982 ac0787bdd5
commit 4ab26b4bbd
7 changed files with 83 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
datacenterlight/static/datacenterlight/css/landing-page.css
View File

@ -4,10 +4,10 @@
* For details, see http://www.apache.org/licenses/LICENSE-2.0. * For details, see http://www.apache.org/licenses/LICENSE-2.0.
*/ */
@font-face { /*@font-face {
font-family: 'Lato-Light'; font-family: 'Lato-Light';
src: url('../fonts/Lato/Lato-Light.ttf'); src: url('../fonts/Lato/Lato-Light.ttf');
} }*/
body, body,
html { html {
@ -22,7 +22,12 @@ h3,
h4, h4,
h5, h5,
h6 { 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; font-weight: 300;
} }
@ -143,13 +148,15 @@ h6 {
.navbar-default .navbar-nav>li>a { .navbar-default .navbar-nav>li>a {
cursor: pointer; cursor: pointer;
font-family: 'Lato-Light', sans-serif; /*font-family: 'Lato-Light', sans-serif;*/
font-weight: 300;
} }
.navbar-transparent .navbar-nav>li>a { .navbar-transparent .navbar-nav>li>a {
color: #fff; color: #fff;
cursor: pointer; cursor: pointer;
font-family: 'Lato-Light', sans-serif; /*font-family: 'Lato-Light', sans-serif;*/
font-weight: 300;
} }
.navbar-transparent .navbar-nav>li>a:hover { .navbar-transparent .navbar-nav>li>a:hover {
@ -202,13 +209,15 @@ h6 {
.navbar-transparent .nav-language .select-language { .navbar-transparent .nav-language .select-language {
color: #fff; color: #fff;
font-family: 'Lato-Light', sans-serif; /*font-family: 'Lato-Light', sans-serif;*/
font-weight: 300;
} }
.nav-language .select-language span { .nav-language .select-language span {
margin-left: 5px; margin-left: 5px;
margin-right: 5px; margin-right: 5px;
font-family: 'Lato', sans-serif; /*font-family: 'Lato', sans-serif;*/
font-weight: normal;
} }
.nav-language .drop-language{ .nav-language .drop-language{
/*position: absolute;*/ /*position: absolute;*/
@ -237,7 +246,8 @@ h6 {
.nav-language .drop-language a{ .nav-language .drop-language a{
cursor: pointer; cursor: pointer;
padding: 5px 10px !important; 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 */ /* Show the dropdown menu on hover */
@ -260,7 +270,8 @@ h6 {
.navbar-transparent .nav-language .drop-language a { .navbar-transparent .nav-language .drop-language a {
color: #fff; color: #fff;
padding: 5px 10px !important; padding: 5px 10px !important;
font-family: 'Lato-Light', sans-serif; /*font-family: 'Lato-Light', sans-serif;*/
font-weight: 300;
} }
/* .nav-language:hover .drop-language{ /* .nav-language:hover .drop-language{
display: block; display: block;
@ -343,7 +354,7 @@ h6 {
.intro-message>h1 { .intro-message>h1 {
margin: 0; margin: 0;
font-weight: 400; font-weight: 300;
font-size: 6em; font-size: 6em;
} }
@ -792,7 +803,8 @@ tech-sub-sec h2 {
} }
.percent-text { .percent-text {
font-family: 'Lato', sans-serif; /*font-family: 'Lato', sans-serif;*/
/* font-weight: normal; */
font-size: 50px; font-size: 50px;
color: #999; color: #999;
} }
@ -879,7 +891,7 @@ tech-sub-sec h2 {
.dropdown-menu>li>a { .dropdown-menu>li>a {
font-size: 13px; font-size: 13px;
font-weight: 300; font-weight: 300;
font-family: 'Lato-Light', sans-serif; /*font-family: 'Lato-Light', sans-serif;*/
} }
.navbar-default .navbar-nav>.active>a, .navbar-default .navbar-nav>.active>a,
@ -898,7 +910,8 @@ tech-sub-sec h2 {
background: -webkit-linear-gradient(top, #f0f4f7, #fff) no-repeat; background: -webkit-linear-gradient(top, #f0f4f7, #fff) no-repeat;
background: linear-gradient(to bottom, #f0f4f7, #fff) no-repeat; background: linear-gradient(to bottom, #f0f4f7, #fff) no-repeat;
display: flex; display: flex;
font-family: 'Lato', sans-serif; /*font-family: 'Lato', sans-serif;*/
/* font-weight: normal; */
} }
.price-calc-section .text { .price-calc-section .text {
@ -963,7 +976,8 @@ tech-sub-sec h2 {
} }
.price-calc-section .card .title h3 { .price-calc-section .card .title h3 {
font-family: 'Lato', sans-serif; /*font-family: 'Lato', sans-serif;*/
font-weight: normal;
} }
.price-calc-section .card .price { .price-calc-section .card .price {
@ -1050,8 +1064,9 @@ tech-sub-sec h2 {
.price-calc-section .card .description.input label { .price-calc-section .card .description.input label {
font-size: 15px; font-size: 15px;
font-weight: 800; font-weight: 700;
font-family: 'Lato'; /*font-weight: 800;*/
/*font-family: 'Lato';*/
margin-bottom: 0; margin-bottom: 0;
width: 40px; width: 40px;
} }
@ -1364,7 +1379,8 @@ tech-sub-sec h2 {
padding: 30px; padding: 30px;
} }
.percent-text { .percent-text {
font-family: 'Lato'; /*font-family: 'Lato';*/
font-weight: normal;
font-size: 37px; font-size: 37px;
/* text-align: center; */ /* text-align: center; */
} }
@ -1402,7 +1418,7 @@ tech-sub-sec h2 {
.network-name { .network-name {
text-transform: uppercase; text-transform: uppercase;
font-size: 14px; font-size: 14px;
font-weight: 400; font-weight: 300;
letter-spacing: 2px; letter-spacing: 2px;
} }

2
hosting/locale/de/LC_MESSAGES/django.po
View File

@ -393,7 +393,7 @@ msgstr ""
msgid "Delete SSH Key" msgid "Delete SSH Key"
msgstr "SSH Key löschen" 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?" msgstr "Möchtest Du den Schlüssel löschen?"
msgid "Show" msgid "Show"

6
hosting/static/hosting/css/commons.css
View File

@ -110,12 +110,16 @@
font-weight: 100; font-weight: 100;
color: #999; color: #999;
} }
.modal-body .modal-icon {
margin-bottom: 10px;
}
.modal-title { .modal-title {
margin: 0; margin: 0;
line-height: 1.42857143; line-height: 1.42857143;
font-size: 25px; font-size: 25px;
padding: 0; padding: 0;
font-family: 'Lato', sans-serif; /*font-family: 'Lato', sans-serif;*/
font-weight: 300;
} }
.modal-text { .modal-text {
padding-top: 15px; padding-top: 15px;

21
hosting/static/hosting/css/landing-page.css
View File

@ -4,7 +4,7 @@
* For details, see http://www.apache.org/licenses/LICENSE-2.0. * For details, see http://www.apache.org/licenses/LICENSE-2.0.
*/ */
@font-face { /*@font-face {
font-family: 'Lato-Regular'; font-family: 'Lato-Regular';
src: url('../fonts/Lato/Lato-Regular.ttf'); src: url('../fonts/Lato/Lato-Regular.ttf');
} }
@ -16,7 +16,7 @@
@font-face { @font-face {
font-family: 'Lato-Light'; font-family: 'Lato-Light';
src: url('../fonts/Lato/Lato-Light.ttf'); src: url('../fonts/Lato/Lato-Light.ttf');
} }*/
body, body,
html { html {
@ -31,8 +31,9 @@ h3,
h4, h4,
h5, h5,
h6 { h6 {
font-family: 'Lato-Regular', sans-serif; /*font-family: 'Lato-Regular', sans-serif;*/
font-weight: 300; font-family: 'Lato', sans-serif;
/*font-weight: 300;*/
} }
.topnav { .topnav {
@ -53,7 +54,8 @@ h6 {
.navbar-transparent .navbar-nav>li>a { .navbar-transparent .navbar-nav>li>a {
color: #fff; color: #fff;
cursor: pointer; cursor: pointer;
font-family: 'Lato-Regular', sans-serif; /*font-family: 'Lato-Regular', sans-serif;*/
font-weight: normal;
} }
.navbar-transparent .navbar-nav>li>a:hover { .navbar-transparent .navbar-nav>li>a:hover {
color: #fff; color: #fff;
@ -376,7 +378,8 @@ h6 {
text-align: center; text-align: center;
font-size: 18px; font-size: 18px;
line-height: 30px; line-height: 30px;
font-family: 'Lato' !important; /*font-family: 'Lato' !important;*/
font-weight: 300 !important;
} }
.sign-up-message a { .sign-up-message a {
@ -488,7 +491,8 @@ a.unlink:hover {
/***** DCL payment page **********/ /***** DCL payment page **********/
.dcl-order-container { .dcl-order-container {
font-family: Lato; /*font-family: Lato;*/
font-weight: 300;
} }
.dcl-order-table-header { .dcl-order-table-header {
@ -547,7 +551,8 @@ a.unlink:hover {
} }
.card-warning-content { .card-warning-content {
font-family: Lato; /*font-family: Lato;*/
font-weight: 300;
border: 1px solid #a1a1a1; border: 1px solid #a1a1a1;
border-radius: 3px; border-radius: 3px;
padding: 5px; padding: 5px;

2
hosting/static/hosting/css/pricing.css
View File

@ -9,7 +9,7 @@
font-size: 14px; font-size: 14px;
padding-left: 0; padding-left: 0;
margin-bottom: 30px; margin-bottom: 30px;
font-family: 'Lato'; font-family: Lato, sans-serif;
} }

53
hosting/static/hosting/css/user_keys.css
View File

@ -1,6 +1,6 @@
/* ssh_keys_choice */ /* ssh_keys_choice */
.h1-thin { .h1-thin {
font-family: Lato, sans-serif; /*font-family: Lato, sans-serif;*/
font-weight: 300; font-weight: 300;
font-size: 32px; font-size: 32px;
} }
@ -10,12 +10,12 @@
} }
.dashboard-choice-container .page-header p { .dashboard-choice-container .page-header p {
font-size: 16px; font-size: 16px;
font-family: Lato, sans-serif; /*font-family: Lato, sans-serif;*/
font-weight: 300; font-weight: 300;
} }
.dashboard-choice-container h2 { .dashboard-choice-container h2 {
font-family: Lato, sans-serif; /*font-family: Lato, sans-serif;
font-weight: 400; font-weight: 400;*/
font-size: 22px; font-size: 22px;
margin-top: 0; margin-top: 0;
} }
@ -26,7 +26,7 @@
} }
.choice-container p{ .choice-container p{
font-size: 18px; font-size: 18px;
font-family: Lato, sans-serif; /*font-family: Lato, sans-serif;*/
font-weight: 300; font-weight: 300;
} }
.choice-container-top { .choice-container-top {
@ -119,7 +119,7 @@
color: #717274; color: #717274;
font-size: 16px; font-size: 16px;
font-weight: 300; font-weight: 300;
font-family: 'Lato'; /*font-family: 'Lato';*/
} }
.borderless tbody:before { .borderless tbody:before {
@ -195,7 +195,8 @@
border-bottom: 1px solid grey; border-bottom: 1px solid grey;
box-shadow: none; box-shadow: none;
border-radius: 0; border-radius: 0;
font-family: 'Lato-Light', sans-serif; /*font-family: 'Lato-Light', sans-serif;*/
font-weight: 300;
font-size: 20px; font-size: 20px;
padding-left: 0; padding-left: 0;
} }
@ -203,57 +204,58 @@
.form_key_name::-webkit-input-placeholder{ .form_key_name::-webkit-input-placeholder{
font-size: 20px; font-size: 20px;
font-weight:100; font-weight:100;
font-family: 'Lato-Light', sans-serif; /*font-family: 'Lato-Light', sans-serif;*/
font-weight: 300;
} }
.form_key_name::-moz-input-placeholder{ .form_key_name::-moz-input-placeholder{
font-size: 20px; 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{ .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-size: 20px;
font-weight:200;
} }
.form_key_name:-ms-input-placeholder { .form_key_name:-ms-input-placeholder {
font-size: 20px; font-size: 20px;
font-family: 'Lato-Light', sans-serif; /*font-family: 'Lato-Light', sans-serif;*/
font-weight:200; font-weight: 300;
} }
.form_public_key::-webkit-input-placeholder{ .form_public_key::-webkit-input-placeholder{
position: relative; position: relative;
top: 110px; top: 110px;
font-size: 20px; 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{ .form_public_key::-moz-input-placeholder{
position: relative; position: relative;
top: 110px; top: 110px;
font-size: 20px; font-size: 20px;
font-family: 'Lato-Light', sans-serif; /*font-family: 'Lato-Light', sans-serif;*/
font-weight:200; font-weight: 300;
} }
.form_public_key:-moz-input-placeholder{ .form_public_key:-moz-input-placeholder{
position: relative; position: relative;
top: 110px; top: 110px;
font-size: 20px; 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 { .form_public_key:-ms-input-placeholder {
position: relative; position: relative;
top: 110px; top: 110px;
font-size: 20px; font-size: 20px;
font-weight:200; /*font-family: 'Lato-Light', sans-serif;*/
font-family: 'Lato-Light', sans-serif; font-weight: 300;
} }
.underform-contaner{ .underform-contaner{
margin-bottom: 20px; margin-bottom: 20px;
@ -273,7 +275,8 @@
} }
} }
.underform-contaner h4{ .underform-contaner h4{
font-family: 'Lato-Light', sans-serif; /*font-family: 'Lato-Light', sans-serif;*/
font-weight: 300;
} }
.underform-contaner button{ .underform-contaner button{
/* font-family: Lato; */ /* font-family: Lato; */
@ -287,9 +290,9 @@
color: #fff; color: #fff;
} }
.control-label{ .control-label{
font-family: 'Lato-Light', sans-serif; /*font-family: 'Lato-Light', sans-serif;*/
font-weight: 300;
font-size: 20px; font-size: 20px;
font-weight:200;
} }
.form-ssh h3{ .form-ssh h3{
margin-bottom: 40px; margin-bottom: 40px;

2
hosting/templates/hosting/user_keys.html
View File

@ -50,7 +50,7 @@
<div class="modal-body"> <div class="modal-body">
<div class="modal-icon"><i class="fa fa-trash" aria-hidden="true"></i></div> <div class="modal-icon"><i class="fa fa-trash" aria-hidden="true"></i></div>
<h4 class="modal-title" id="ModalLabel">{% trans "Delete SSH Key"%}</h4> <h4 class="modal-title" id="ModalLabel">{% trans "Delete SSH Key"%}</h4>
<p class="modal-text">{% trans "Do You want to delete this key?"%}</p> <p class="modal-text">{% trans "Do you want to delete this key?"%}</p>
<form method="post" action="{% url 'hosting:delete_ssh_key' user_key.id %}"> <form method="post" action="{% url 'hosting:delete_ssh_key' user_key.id %}">
{% csrf_token %} {% csrf_token %}
<div class="modal-footer"> <div class="modal-footer">