Skip to content

gargantext
gargantext
Commit a0c0a54f authored by Administrator's avatar Administrator
Browse files
Options

[DESIGN] Adapting CSS to CSI style.

parent 1a54718e
Hide whitespace changes
Inline Side-by-side
Showing with 110 additions and 111 deletions
static/css/bootstrap.css
View file @ a0c0a54f
......@@ -253,8 +253,8 @@ body {
font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
font-size: 14px;
line-height: 1.428571429;
color: #654d29;
background-color: #f2e3a1;
color: #666666;
background-color: #f8f8f7;
}
input,
button,
......@@ -271,12 +271,12 @@ textarea {
background-image: none;
}
a {
color: #9f6918;
color: #bd2525;
text-decoration: none;
}
a:hover,
a:focus {
color: #5d3d0e;
color: #7d1818;
text-decoration: underline;
}
a:focus {
......@@ -298,7 +298,7 @@ img {
.img-thumbnail {
padding: 4px;
line-height: 1.428571429;
background-color: #f2e3a1;
background-color: #f8f8f7;
border: 1px solid #dddddd;
border-radius: 4px;
-webkit-transition: all 0.2s ease-in-out;
......@@ -314,7 +314,7 @@ hr {
margin-top: 20px;
margin-bottom: 20px;
border: 0;
border-top: 1px solid #d1ae5a;
border-top: 1px solid #eaafae;
}
.sr-only {
position: absolute;
......@@ -347,10 +347,10 @@ cite {
font-style: normal;
}
.text-muted {
color: #caa24c;
color: #a2a3a2;
}
.text-primary {
color: #9f6918;
color: #bd2525;
}
.text-warning {
color: #c09853;
......@@ -403,7 +403,7 @@ h6 small,
.h6 small {
font-weight: normal;
line-height: 1;
color: #caa24c;
color: #a2a3a2;
}
h1,
h2,
......@@ -458,7 +458,7 @@ h4 small,
.page-header {
padding-bottom: 9px;
margin: 40px 0 20px;
border-bottom: 1px solid #d1ae5a;
border-bottom: 1px solid #eaafae;
}
ul,
ol {
......@@ -538,7 +538,7 @@ dd {
abbr[title],
abbr[data-original-title] {
cursor: help;
border-bottom: 1px dotted #caa24c;
border-bottom: 1px dotted #a2a3a2;
}
abbr.initialism {
font-size: 90%;
......@@ -547,7 +547,7 @@ abbr.initialism {
blockquote {
padding: 10px 20px;
margin: 0 0 20px;
border-left: 5px solid #d1ae5a;
border-left: 5px solid #eaafae;
}
blockquote p {
font-size: 17.5px;
......@@ -560,7 +560,7 @@ blockquote p:last-child {
blockquote small {
display: block;
line-height: 1.428571429;
color: #caa24c;
color: #a2a3a2;
}
blockquote small:before {
content: '\2014 \00A0';
......@@ -568,7 +568,7 @@ blockquote small:before {
blockquote.pull-right {
padding-right: 15px;
padding-left: 0;
border-right: 5px solid #d1ae5a;
border-right: 5px solid #eaafae;
border-left: 0;
}
blockquote.pull-right p,
......@@ -613,7 +613,7 @@ pre {
line-height: 1.428571429;
word-break: break-all;
word-wrap: break-word;
color: #654d29;
color: #666666;
background-color: #f5f5f5;
border: 1px solid #cccccc;
border-radius: 4px;
......@@ -1290,11 +1290,11 @@ th {
padding: 8px;
line-height: 1.428571429;
vertical-align: top;
border-top: 1px solid #654d29;
border-top: 1px solid #666666;
}
.table thead > tr > th {
vertical-align: bottom;
border-bottom: 2px solid #654d29;
border-bottom: 2px solid #666666;
}
.table caption + thead tr:first-child th,
.table colgroup + thead tr:first-child th,
......@@ -1305,10 +1305,10 @@ th {
border-top: 0;
}
.table tbody + tbody {
border-top: 2px solid #654d29;
border-top: 2px solid #666666;
}
.table .table {
background-color: #f2e3a1;
background-color: #f8f8f7;
}
.table-condensed thead > tr > th,
.table-condensed tbody > tr > th,
......@@ -1319,7 +1319,7 @@ th {
padding: 5px;
}
.table-bordered {
border: 1px solid #654d29;
border: 1px solid #666666;
}
.table-bordered > thead > tr > th,
.table-bordered > tbody > tr > th,
......@@ -1327,7 +1327,7 @@ th {
.table-bordered > thead > tr > td,
.table-bordered > tbody > tr > td,
.table-bordered > tfoot > tr > td {
border: 1px solid #654d29;
border: 1px solid #666666;
}
.table-bordered > thead > tr > th,
.table-bordered > thead > tr > td {
......@@ -1433,7 +1433,7 @@ table th[class*="col-"] {
margin-bottom: 15px;
overflow-y: hidden;
overflow-x: scroll;
border: 1px solid #654d29;
border: 1px solid #666666;
}
.table-responsive > .table {
margin-bottom: 0;
......@@ -1487,7 +1487,7 @@ legend {
margin-bottom: 20px;
font-size: 21px;
line-height: inherit;
color: #654d29;
color: #666666;
border: 0;
border-bottom: 1px solid #e5e5e5;
}
......@@ -1533,16 +1533,16 @@ input[type="number"]::-webkit-inner-spin-button {
height: auto;
}
.form-control:-moz-placeholder {
color: #caa24c;
color: #a2a3a2;
}
.form-control::-moz-placeholder {
color: #caa24c;
color: #a2a3a2;
}
.form-control:-ms-input-placeholder {
color: #caa24c;
color: #a2a3a2;
}
.form-control::-webkit-input-placeholder {
color: #caa24c;
color: #a2a3a2;
}
.form-control {
display: block;
......@@ -1551,7 +1551,7 @@ input[type="number"]::-webkit-inner-spin-button {
padding: 6px 12px;
font-size: 14px;
line-height: 1.428571429;
color: #a07833;
color: #a5817f;
vertical-align: middle;
background-color: #ffffff;
border: 1px solid #cccccc;
......@@ -1571,7 +1571,7 @@ input[type="number"]::-webkit-inner-spin-button {
.form-control[readonly],
fieldset[disabled] .form-control {
cursor: not-allowed;
background-color: #d1ae5a;
background-color: #eaafae;
}
textarea.form-control {
height: auto;
......@@ -1727,7 +1727,7 @@ textarea.input-lg {
display: block;
margin-top: 5px;
margin-bottom: 10px;
color: #ba9154;
color: #a6a6a6;
}
@media (min-width: 768px) {
.form-inline .form-group {
......@@ -1878,8 +1878,8 @@ fieldset[disabled] .btn-default.active {
}
.btn-primary {
color: #ffffff;
background-color: #9f6918;
border-color: #895a15;
background-color: #bd2525;
border-color: #a82121;
}
.btn-primary:hover,
.btn-primary:focus,
......@@ -1887,8 +1887,8 @@ fieldset[disabled] .btn-default.active {
.btn-primary.active,
.open .dropdown-toggle.btn-primary {
color: #ffffff;
background-color: #7c5213;
border-color: #54370d;
background-color: #9b1e1e;
border-color: #741717;
}
.btn-primary:active,
.btn-primary.active,
......@@ -1910,8 +1910,8 @@ fieldset[disabled] .btn-primary:active,
.btn-primary.disabled.active,
.btn-primary[disabled].active,
fieldset[disabled] .btn-primary.active {
background-color: #9f6918;
border-color: #895a15;
background-color: #bd2525;
border-color: #a82121;
}
.btn-warning {
color: #ffffff;
......@@ -2062,7 +2062,7 @@ fieldset[disabled] .btn-info.active {
border-color: #46b8da;
}
.btn-link {
color: #9f6918;
color: #bd2525;
font-weight: normal;
cursor: pointer;
border-radius: 0;
......@@ -2083,7 +2083,7 @@ fieldset[disabled] .btn-link {
}
.btn-link:hover,
.btn-link:focus {
color: #5d3d0e;
color: #7d1818;
text-decoration: underline;
background-color: transparent;
}
......@@ -2091,7 +2091,7 @@ fieldset[disabled] .btn-link {
fieldset[disabled] .btn-link:hover,
.btn-link[disabled]:focus,
fieldset[disabled] .btn-link:focus {
color: #caa24c;
color: #a2a3a2;
text-decoration: none;
}
.btn-lg {
......@@ -2814,14 +2814,14 @@ input[type="button"].btn-block {
clear: both;
font-weight: normal;
line-height: 1.428571429;
color: #654d29;
color: #666666;
white-space: nowrap;
}
.dropdown-menu > li > a:hover,
.dropdown-menu > li > a:focus {
text-decoration: none;
color: #ffffff;
background-color: #9f6918;
background-color: #bd2525;
}
.dropdown-menu > .active > a,
.dropdown-menu > .active > a:hover,
......@@ -2829,12 +2829,12 @@ input[type="button"].btn-block {
color: #ffffff;
text-decoration: none;
outline: 0;
background-color: #9f6918;
background-color: #bd2525;
}
.dropdown-menu > .disabled > a,
.dropdown-menu > .disabled > a:hover,
.dropdown-menu > .disabled > a:focus {
color: #caa24c;
color: #a2a3a2;
}
.dropdown-menu > .disabled > a:hover,
.dropdown-menu > .disabled > a:focus {
......@@ -2855,7 +2855,7 @@ input[type="button"].btn-block {
padding: 3px 20px;
font-size: 12px;
line-height: 1.428571429;
color: #caa24c;
color: #a2a3a2;
}
.dropdown-backdrop {
position: fixed;
......@@ -3203,7 +3203,7 @@ textarea.input-group-sm > .input-group-btn > .btn {
font-weight: normal;
line-height: 1;
text-align: center;
background-color: #d1ae5a;
background-color: #eaafae;
border: 1px solid #cccccc;
border-radius: 4px;
}
......@@ -3298,14 +3298,14 @@ textarea.input-group-sm > .input-group-btn > .btn {
.nav > li > a:hover,
.nav > li > a:focus {
text-decoration: none;
background-color: #d1ae5a;
background-color: #eaafae;
}
.nav > li.disabled > a {
color: #caa24c;
color: #a2a3a2;
}
.nav > li.disabled > a:hover,
.nav > li.disabled > a:focus {
color: #caa24c;
color: #a2a3a2;
text-decoration: none;
background-color: transparent;
cursor: not-allowed;
......@@ -3313,8 +3313,8 @@ textarea.input-group-sm > .input-group-btn > .btn {
.nav .open > a,
.nav .open > a:hover,
.nav .open > a:focus {
background-color: #d1ae5a;
border-color: #9f6918;
background-color: #eaafae;
border-color: #bd2525;
}
.nav .nav-divider {
height: 1px;
......@@ -3339,13 +3339,13 @@ textarea.input-group-sm > .input-group-btn > .btn {
border-radius: 4px 4px 0 0;
}
.nav-tabs > li > a:hover {
border-color: #d1ae5a #d1ae5a #dddddd;
border-color: #eaafae #eaafae #dddddd;
}
.nav-tabs > li.active > a,
.nav-tabs > li.active > a:hover,
.nav-tabs > li.active > a:focus {
color: #a07833;
background-color: #f2e3a1;
color: #a5817f;
background-color: #f8f8f7;
border: 1px solid #dddddd;
border-bottom-color: transparent;
cursor: default;
......@@ -3371,7 +3371,7 @@ textarea.input-group-sm > .input-group-btn > .btn {
margin-right: 0;
}
.nav-tabs.nav-justified > .active > a {
border-bottom-color: #f2e3a1;
border-bottom-color: #f8f8f7;
}
.nav-pills > li {
float: left;
......@@ -3386,7 +3386,7 @@ textarea.input-group-sm > .input-group-btn > .btn {
.nav-pills > li.active > a:hover,
.nav-pills > li.active > a:focus {
color: #ffffff;
background-color: #9f6918;
background-color: #bd2525;
}
.nav-stacked > li {
float: none;
......@@ -3418,7 +3418,7 @@ textarea.input-group-sm > .input-group-btn > .btn {
margin-right: 0;
}
.nav-tabs-justified > .active > a {
border-bottom-color: #f2e3a1;
border-bottom-color: #f8f8f7;
}
.tabbable:before,
.tabbable:after {
......@@ -3453,12 +3453,12 @@ textarea.input-group-sm > .input-group-btn > .btn {
display: block;
}
.nav .caret {
border-top-color: #9f6918;
border-bottom-color: #9f6918;
border-top-color: #bd2525;
border-bottom-color: #bd2525;
}
.nav a:hover .caret {
border-top-color: #5d3d0e;
border-bottom-color: #5d3d0e;
border-top-color: #7d1818;
border-bottom-color: #7d1818;
}
.nav-tabs .dropdown-menu {
margin-top: -1px;
......@@ -3901,11 +3901,11 @@ textarea.input-group-sm > .input-group-btn > .btn {
color: #333333;
}
.navbar-inverse {
background-color: #191d26;
border-color: #050607;
background-color: #090a09;
border-color: #000000;
}
.navbar-inverse .navbar-brand {
color: #caa24c;
color: #a2a3a2;
}
.navbar-inverse .navbar-brand:hover,
.navbar-inverse .navbar-brand:focus {
......@@ -3913,10 +3913,10 @@ textarea.input-group-sm > .input-group-btn > .btn {
background-color: transparent;
}
.navbar-inverse .navbar-text {
color: #caa24c;
color: #a2a3a2;
}
.navbar-inverse .navbar-nav > li > a {
color: #caa24c;
color: #a2a3a2;
}
.navbar-inverse .navbar-nav > li > a:hover,
.navbar-inverse .navbar-nav > li > a:focus {
......@@ -3927,7 +3927,7 @@ textarea.input-group-sm > .input-group-btn > .btn {
.navbar-inverse .navbar-nav > .active > a:hover,
.navbar-inverse .navbar-nav > .active > a:focus {
color: #ffffff;
background-color: #050607;
background-color: #000000;
}
.navbar-inverse .navbar-nav > .disabled > a,
.navbar-inverse .navbar-nav > .disabled > a:hover,
......@@ -3947,12 +3947,12 @@ textarea.input-group-sm > .input-group-btn > .btn {
}
.navbar-inverse .navbar-collapse,
.navbar-inverse .navbar-form {
border-color: #0b0d10;
border-color: #000000;
}
.navbar-inverse .navbar-nav > .open > a,
.navbar-inverse .navbar-nav > .open > a:hover,
.navbar-inverse .navbar-nav > .open > a:focus {
background-color: #050607;
background-color: #000000;
color: #ffffff;
}
.navbar-inverse .navbar-nav > .dropdown > a:hover .caret {
......@@ -3960,8 +3960,8 @@ textarea.input-group-sm > .input-group-btn > .btn {
border-bottom-color: #ffffff;
}
.navbar-inverse .navbar-nav > .dropdown > a .caret {
border-top-color: #caa24c;
border-bottom-color: #caa24c;
border-top-color: #a2a3a2;
border-bottom-color: #a2a3a2;
}
.navbar-inverse .navbar-nav > .open > a .caret,
.navbar-inverse .navbar-nav > .open > a:hover .caret,
......@@ -3971,10 +3971,10 @@ textarea.input-group-sm > .input-group-btn > .btn {
}
@media (max-width: 767px) {
.navbar-inverse .navbar-nav .open .dropdown-menu > .dropdown-header {
border-color: #050607;
border-color: #000000;
}
.navbar-inverse .navbar-nav .open .dropdown-menu > li > a {
color: #caa24c;
color: #a2a3a2;
}
.navbar-inverse .navbar-nav .open .dropdown-menu > li > a:hover,
.navbar-inverse .navbar-nav .open .dropdown-menu > li > a:focus {
......@@ -3985,7 +3985,7 @@ textarea.input-group-sm > .input-group-btn > .btn {
.navbar-inverse .navbar-nav .open .dropdown-menu > .active > a:hover,
.navbar-inverse .navbar-nav .open .dropdown-menu > .active > a:focus {
color: #ffffff;
background-color: #050607;
background-color: #000000;
}
.navbar-inverse .navbar-nav .open .dropdown-menu > .disabled > a,
.navbar-inverse .navbar-nav .open .dropdown-menu > .disabled > a:hover,
......@@ -3995,7 +3995,7 @@ textarea.input-group-sm > .input-group-btn > .btn {
}
}
.navbar-inverse .navbar-link {
color: #caa24c;
color: #a2a3a2;
}
.navbar-inverse .navbar-link:hover {
color: #ffffff;
......@@ -4016,7 +4016,7 @@ textarea.input-group-sm > .input-group-btn > .btn {
color: #cccccc;
}
.breadcrumb > .active {
color: #caa24c;
color: #a2a3a2;
}
.pagination {
display: inline-block;
......@@ -4053,7 +4053,7 @@ textarea.input-group-sm > .input-group-btn > .btn {
.pagination > li > span:hover,
.pagination > li > a:focus,
.pagination > li > span:focus {
background-color: #d1ae5a;
background-color: #eaafae;
}
.pagination > .active > a,
.pagination > .active > span,
......@@ -4063,15 +4063,15 @@ textarea.input-group-sm > .input-group-btn > .btn {
.pagination > .active > span:focus {
z-index: 2;
color: #ffffff;
background-color: #9f6918;
border-color: #9f6918;
background-color: #bd2525;
border-color: #bd2525;
cursor: default;
}
.pagination > .disabled > span,
.pagination > .disabled > a,
.pagination > .disabled > a:hover,
.pagination > .disabled > a:focus {
color: #caa24c;
color: #a2a3a2;
background-color: #ffffff;
border-color: #dddddd;
cursor: not-allowed;
......@@ -4150,7 +4150,7 @@ textarea.input-group-sm > .input-group-btn > .btn {
.pager li > a:hover,
.pager li > a:focus {
text-decoration: none;
background-color: #d1ae5a;
background-color: #eaafae;
}
.pager .next > a,
.pager .next > span {
......@@ -4164,7 +4164,7 @@ textarea.input-group-sm > .input-group-btn > .btn {
.pager .disabled > a:hover,
.pager .disabled > a:focus,
.pager .disabled > span {
color: #caa24c;
color: #a2a3a2;
background-color: #ffffff;
cursor: not-allowed;
}
......@@ -4190,18 +4190,18 @@ textarea.input-group-sm > .input-group-btn > .btn {
display: none;
}
.label-default {
background-color: #caa24c;
background-color: #a2a3a2;
}
.label-default[href]:hover,
.label-default[href]:focus {
background-color: #af8834;
background-color: #888a88;
}
.label-primary {
background-color: #9f6918;
background-color: #bd2525;
}
.label-primary[href]:hover,
.label-primary[href]:focus {
background-color: #734c11;
background-color: #921d1d;
}
.label-success {
background-color: #5cb85c;
......@@ -4242,7 +4242,7 @@ textarea.input-group-sm > .input-group-btn > .btn {
vertical-align: baseline;
white-space: nowrap;
text-align: center;
background-color: #caa24c;
background-color: #a2a3a2;
border-radius: 10px;
}
.badge:empty {
......@@ -4260,7 +4260,7 @@ a.badge:focus {
}
a.list-group-item.active > .badge,
.nav-pills > .active > a > .badge {
color: #9f6918;
color: #bd2525;
background-color: #ffffff;
}
.nav-pills > li > a > .badge {
......@@ -4273,7 +4273,7 @@ a.list-group-item.active > .badge,
font-weight: 200;
line-height: 2.1428571435;
color: inherit;
background-color: #d1ae5a;
background-color: #eaafae;
}
.jumbotron h1 {
line-height: 1;
......@@ -4301,7 +4301,7 @@ a.list-group-item.active > .badge,
.thumbnail {
padding: 4px;
line-height: 1.428571429;
background-color: #f2e3a1;
background-color: #f8f8f7;
border: 1px solid #dddddd;
border-radius: 4px;
-webkit-transition: all 0.2s ease-in-out;
......@@ -4318,7 +4318,7 @@ a.list-group-item.active > .badge,
}
a.thumbnail:hover,
a.thumbnail:focus {
border-color: #9f6918;
border-color: #bd2525;
}
.thumbnail > img {
margin-left: auto;
......@@ -4326,7 +4326,7 @@ a.thumbnail:focus {
}
.thumbnail .caption {
padding: 9px;
color: #654d29;
color: #666666;
}
.alert {
padding: 15px;
......@@ -4449,7 +4449,7 @@ a.thumbnail:focus {
font-size: 12px;
color: #ffffff;
text-align: center;
background-color: #9f6918;
background-color: #bd2525;
-webkit-box-shadow: inset 0 -1px 0 rgba(0, 0, 0, 0.15);
box-shadow: inset 0 -1px 0 rgba(0, 0, 0, 0.15);
-webkit-transition: width 0.6s ease;
......@@ -4576,8 +4576,8 @@ a.list-group-item:focus {
.list-group-item.active:focus {
z-index: 2;
color: #ffffff;
background-color: #9f6918;
border-color: #9f6918;
background-color: #bd2525;
border-color: #bd2525;
}
.list-group-item.active .list-group-item-heading,
.list-group-item.active:hover .list-group-item-heading,
......@@ -4587,7 +4587,7 @@ a.list-group-item:focus {
.list-group-item.active .list-group-item-text,
.list-group-item.active:hover .list-group-item-text,
.list-group-item.active:focus .list-group-item-text {
color: #efcb94;
color: #f2bcbc;
}
.list-group-item-heading {
margin-top: 0;
......@@ -4652,7 +4652,7 @@ a.list-group-item:focus {
margin-bottom: 0;
}
.panel > .panel-body + .table {
border-top: 1px solid #654d29;
border-top: 1px solid #666666;
}
.panel-heading {
padding: 10px 15px;
......@@ -4699,7 +4699,7 @@ a.list-group-item:focus {
border-color: #dddddd;
}
.panel-default > .panel-heading {
color: #654d29;
color: #666666;
background-color: #f5f5f5;
border-color: #dddddd;
}
......@@ -4710,18 +4710,18 @@ a.list-group-item:focus {
border-bottom-color: #dddddd;
}
.panel-primary {
border-color: #9f6918;
border-color: #bd2525;
}
.panel-primary > .panel-heading {
color: #ffffff;
background-color: #9f6918;
border-color: #9f6918;
background-color: #bd2525;
border-color: #bd2525;
}
.panel-primary > .panel-heading + .panel-collapse .panel-body {
border-top-color: #9f6918;
border-top-color: #bd2525;
}
.panel-primary > .panel-footer + .panel-collapse .panel-body {
border-bottom-color: #9f6918;
border-bottom-color: #bd2525;
}
.panel-success {
border-color: #d6e9c6;
......
static/css/variables.less
View file @ a0c0a54f
......@@ -10,15 +10,15 @@
// -------------------------
@gray-darker: lighten(#000, 13.5%); // #222
@gray-dark: #654d29; // #333
@gray: #a07833; // #555
@gray-light: #caa24c; // #999
@gray-lighter: #d1ae5a; // #eee
@gray-dark: #666666; // #333
@gray: #a5817f; // #555
@gray-light: #a2a3a2; // #999
@gray-lighter: #eaafae; // #eee
// Brand colors
// -------------------------
@brand-primary: #9f6918;
@brand-primary: #bd2525;
@brand-success: #5cb85c;
@brand-warning: #f0ad4e;
@brand-danger: #d9534f;
......@@ -27,7 +27,7 @@
// Scaffolding
// -------------------------
@body-bg: #f2e3a1;
@body-bg: #f8f8f7;
@text-color: @gray-dark;
// Links
......@@ -98,7 +98,7 @@
@table-bg-hover: #f5f5f5;
@table-bg-active: @table-bg-hover;
@table-border-color: #654d29; // table and cell border
@table-border-color: #666666; // table and cell border
// Buttons
......@@ -269,7 +269,7 @@
//
// Reset inverted navbar basics
@navbar-inverse-color: @gray-light;
@navbar-inverse-bg: #191d26;
@navbar-inverse-bg: #090a09;
@navbar-inverse-border: darken(@navbar-inverse-bg, 10%);
// Inverted navbar links
......
templates/project.html
View file @ a0c0a54f
......@@ -4,7 +4,6 @@
{% block css %}
{% load staticfiles %}
<link rel="stylesheet" href="{% static "css/bootstrap.css" %}">
<link rel="stylesheet" href="{% static "css/bootstrap-theme.min.css" %}">
<link rel="stylesheet" type="text/css" href="{% static "css/morris.css" %}">
<link rel="stylesheet" type="text/css" href="{% static "css/jquery.easy-pie-chart.css"%}">
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment