Gitlab CSE Unil

Skip to content
GitLab
Commit 0ca01008 authored by Julien Furrer's avatar Julien Furrer
Browse files

Fixed images for 4k screen

parent 4c744c41
Hide whitespace changes
Inline Side-by-side
.gitignore
View file @ 0ca01008
......@@ -17,4 +17,4 @@ adim_project/settings/local_settings.py
adim_project/apache.conf.tpl
adim_app/playground.py
adim_app/templates/playground
adim_app/static/js/playground.js
\ No newline at end of file
adim_app/static/js/playground.js
adim_app/static/_src/less/adim.css
View file @ 0ca01008
span.twitter-typeahead .tt-dropdown-menu {
position: absolute;
top: 100%;
left: 0;
z-index: 1000;
display: none;
float: left;
min-width: 160px;
padding: 5px 0;
margin: 2px 0 0;
list-style: none;
font-size: 14px;
text-align: left;
background-color: #ffffff;
border: 1px solid #cccccc;
border: 1px solid rgba(0, 0, 0, 0.15);
border-radius: 4px;
-webkit-box-shadow: 0 6px 12px rgba(0, 0, 0, 0.175);
box-shadow: 0 6px 12px rgba(0, 0, 0, 0.175);
background-clip: padding-box;
}
span.twitter-typeahead .tt-suggestion > p {
display: block;
padding: 3px 20px;
clear: both;
font-weight: normal;
line-height: 1.42857143;
color: #333333;
white-space: nowrap;
}
span.twitter-typeahead .tt-suggestion > p:hover,
span.twitter-typeahead .tt-suggestion > p:focus {
color: #ffffff;
text-decoration: none;
outline: 0;
background-color: #337ab7;
}
span.twitter-typeahead {
width: 100%;
}
.input-group span.twitter-typeahead {
display: block !important;
}
.input-group span.twitter-typeahead .tt-dropdown-menu {
top: 32px !important;
}
.input-group span.twitter-typeahead .tt-input,
.input-group span.twitter-typeahead .tt-hint {
border-radius: 4px 0 0 4px !important;
height: 30px;
padding: 5px 10px;
font-size: 12px;
line-height: 1.5;
border-radius: 3px;
}
select.input-group span.twitter-typeahead .tt-input,
select.input-group span.twitter-typeahead .tt-hint {
height: 30px;
line-height: 30px;
}
textarea.input-group span.twitter-typeahead .tt-input,
textarea.input-group span.twitter-typeahead .tt-hint,
select[multiple].input-group span.twitter-typeahead .tt-input,
select[multiple].input-group span.twitter-typeahead .tt-hint {
height: auto;
}
.input-group span.twitter-typeahead .tt-hint {
color: #6f6f6f;
}
.input-group.input-group-lg span.twitter-typeahead .tt-dropdown-menu {
top: 44px !important;
}
.input-group.input-group-sm span.twitter-typeahead .tt-dropdown-menu {
top: 28px !important;
}
@font-face {
font-family: 'OpenSans';
src: url('../fonts/open-sans/OpenSans-Light-webfont.eot?nc=a123');
......@@ -439,13 +363,15 @@ body.home #main-navbar {
@media (min-width: 1200px) {
#home-image img {
background: url("../img/image-home-lg.jpg") 0% 50% no-repeat;
background-size: 1140px 761px;
width: 1140px;
height: 761px;
}
}
@media (min-width: 992px) and (max-width: 1199px) {
#home-image img {
background: url("../img/image-home-md.jpg") 0% 50% no-repeat;
background: url("../img/image-home-lg.jpg") 0% 50% no-repeat;
background-size: 940px 628px;
width: 940px;
height: 628px;
}
......@@ -453,6 +379,7 @@ body.home #main-navbar {
@media (min-width: 768px) and (max-width: 991px) {
#home-image img {
background: url("../img/image-home-sm.jpg") 0% 50% no-repeat;
background-size: 720px 525px;
width: 720px;
height: 525px;
}
......@@ -1354,6 +1281,27 @@ canvas.cursor-tool-arrow2 {
.open > .dropdown-toggle.btn-adim-layertb {
background-image: none;
}
.btn-adim-layertb.disabled,
.btn-adim-layertb[disabled],
fieldset[disabled] .btn-adim-layertb,
.btn-adim-layertb.disabled:hover,
.btn-adim-layertb[disabled]:hover,
fieldset[disabled] .btn-adim-layertb:hover,
.btn-adim-layertb.disabled:focus,
.btn-adim-layertb[disabled]:focus,
fieldset[disabled] .btn-adim-layertb:focus,
.btn-adim-layertb.disabled.focus,
.btn-adim-layertb[disabled].focus,
fieldset[disabled] .btn-adim-layertb.focus,
.btn-adim-layertb.disabled:active,
.btn-adim-layertb[disabled]:active,
fieldset[disabled] .btn-adim-layertb:active,
.btn-adim-layertb.disabled.active,
.btn-adim-layertb[disabled].active,
fieldset[disabled] .btn-adim-layertb.active {
background-color: #aaaaaa;
border-color: #777777;
}
.btn-adim-layertb .badge {
color: #aaaaaa;
background-color: #555555;
......@@ -1378,6 +1326,27 @@ canvas.cursor-tool-arrow2 {
.open > .dropdown-toggle.theme-light .btn-adim-layertb {
background-image: none;
}
.theme-light .btn-adim-layertb.disabled,
.theme-light .btn-adim-layertb[disabled],
fieldset[disabled] .theme-light .btn-adim-layertb,
.theme-light .btn-adim-layertb.disabled:hover,
.theme-light .btn-adim-layertb[disabled]:hover,
fieldset[disabled] .theme-light .btn-adim-layertb:hover,
.theme-light .btn-adim-layertb.disabled:focus,
.theme-light .btn-adim-layertb[disabled]:focus,
fieldset[disabled] .theme-light .btn-adim-layertb:focus,
.theme-light .btn-adim-layertb.disabled.focus,
.theme-light .btn-adim-layertb[disabled].focus,
fieldset[disabled] .theme-light .btn-adim-layertb.focus,
.theme-light .btn-adim-layertb.disabled:active,
.theme-light .btn-adim-layertb[disabled]:active,
fieldset[disabled] .theme-light .btn-adim-layertb:active,
.theme-light .btn-adim-layertb.disabled.active,
.theme-light .btn-adim-layertb[disabled].active,
fieldset[disabled] .theme-light .btn-adim-layertb.active {
background-color: #f0f0f0;
border-color: #c0c0c0;
}
.theme-light .btn-adim-layertb .badge {
color: #f0f0f0;
background-color: #555555;
......@@ -1402,6 +1371,27 @@ canvas.cursor-tool-arrow2 {
.open > .dropdown-toggle.btn-adim-dark {
background-image: none;
}
.btn-adim-dark.disabled,
.btn-adim-dark[disabled],
fieldset[disabled] .btn-adim-dark,
.btn-adim-dark.disabled:hover,
.btn-adim-dark[disabled]:hover,
fieldset[disabled] .btn-adim-dark:hover,
.btn-adim-dark.disabled:focus,
.btn-adim-dark[disabled]:focus,
fieldset[disabled] .btn-adim-dark:focus,
.btn-adim-dark.disabled.focus,
.btn-adim-dark[disabled].focus,
fieldset[disabled] .btn-adim-dark.focus,
.btn-adim-dark.disabled:active,
.btn-adim-dark[disabled]:active,
fieldset[disabled] .btn-adim-dark:active,
.btn-adim-dark.disabled.active,
.btn-adim-dark[disabled].active,
fieldset[disabled] .btn-adim-dark.active {
background-color: #767676;
border-color: #9c9c9c;
}
.btn-adim-dark .badge {
color: #767676;
background-color: #c4c4c4;
......@@ -1426,6 +1416,27 @@ canvas.cursor-tool-arrow2 {
.open > .dropdown-toggle.btn-cimaf-layer {
background-image: none;
}
.btn-cimaf-layer.disabled,
.btn-cimaf-layer[disabled],
fieldset[disabled] .btn-cimaf-layer,
.btn-cimaf-layer.disabled:hover,
.btn-cimaf-layer[disabled]:hover,
fieldset[disabled] .btn-cimaf-layer:hover,
.btn-cimaf-layer.disabled:focus,
.btn-cimaf-layer[disabled]:focus,
fieldset[disabled] .btn-cimaf-layer:focus,
.btn-cimaf-layer.disabled.focus,
.btn-cimaf-layer[disabled].focus,
fieldset[disabled] .btn-cimaf-layer.focus,
.btn-cimaf-layer.disabled:active,
.btn-cimaf-layer[disabled]:active,
fieldset[disabled] .btn-cimaf-layer:active,
.btn-cimaf-layer.disabled.active,
.btn-cimaf-layer[disabled].active,
fieldset[disabled] .btn-cimaf-layer.active {
background-color: #696969;
border-color: #909090;
}
.btn-cimaf-layer .badge {
color: #696969;
background-color: #aaaaaa;
......@@ -1843,6 +1854,82 @@ canvas.cursor-tool-arrow2 {
.aom-list-item:hover.current {
border-color: #ffaa33;
}
span.twitter-typeahead .tt-dropdown-menu {
position: absolute;
top: 100%;
left: 0;
z-index: 1000;
display: none;
float: left;
min-width: 160px;
padding: 5px 0;
margin: 2px 0 0;
list-style: none;
font-size: 14px;
text-align: left;
background-color: #ffffff;
border: 1px solid #cccccc;
border: 1px solid rgba(0, 0, 0, 0.15);
border-radius: 4px;
-webkit-box-shadow: 0 6px 12px rgba(0, 0, 0, 0.175);
box-shadow: 0 6px 12px rgba(0, 0, 0, 0.175);
background-clip: padding-box;
}
span.twitter-typeahead .tt-suggestion > p {
display: block;
padding: 3px 20px;
clear: both;
font-weight: normal;
line-height: 1.42857143;
color: #333333;
white-space: nowrap;
}
span.twitter-typeahead .tt-suggestion > p:hover,
span.twitter-typeahead .tt-suggestion > p:focus {
color: #ffffff;
text-decoration: none;
outline: 0;
background-color: #337ab7;
}
span.twitter-typeahead {
width: 100%;
}
.input-group span.twitter-typeahead {
display: block !important;
}
.input-group span.twitter-typeahead .tt-dropdown-menu {
top: 32px !important;
}
.input-group span.twitter-typeahead .tt-input,
.input-group span.twitter-typeahead .tt-hint {
border-radius: 4px 0 0 4px !important;
height: 30px;
padding: 5px 10px;
font-size: 12px;
line-height: 1.5;
border-radius: 3px;
}
select.input-group span.twitter-typeahead .tt-input,
select.input-group span.twitter-typeahead .tt-hint {
height: 30px;
line-height: 30px;
}
textarea.input-group span.twitter-typeahead .tt-input,
textarea.input-group span.twitter-typeahead .tt-hint,
select[multiple].input-group span.twitter-typeahead .tt-input,
select[multiple].input-group span.twitter-typeahead .tt-hint {
height: auto;
}
.input-group span.twitter-typeahead .tt-hint {
color: #6f6f6f;
}
.input-group.input-group-lg span.twitter-typeahead .tt-dropdown-menu {
top: 44px !important;
}
.input-group.input-group-sm span.twitter-typeahead .tt-dropdown-menu {
top: 28px !important;
}
.twitter-typeahead .tt-dataset-users2 .tt-suggestion p {
font-style: italic;
color: #777777;
......
adim_app/static/_src/less/adim.less
View file @ 0ca01008
......@@ -312,18 +312,22 @@ body.home {
// Large
@media (min-width: @screen-lg-min) {
background: url("../img/image-home-lg.jpg") 0% 50% no-repeat;
background-size: 1140px 761px;
width: 1140px; //992px;
height: 761px; //663px;
}
// Medium
@media (min-width: @screen-md-min) and (max-width: @screen-md-max) {
background: url("../img/image-home-md.jpg") 0% 50% no-repeat;
// background: url("../img/image-home-md.jpg") 0% 50% no-repeat;
background: url("../img/image-home-lg.jpg") 0% 50% no-repeat;
background-size: 940px 628px;
width: 940px;
height: 628px;
}
// Small
@media (min-width: @screen-sm-min) and (max-width: @screen-sm-max) {
background: url("../img/image-home-sm.jpg") 0% 50% no-repeat;
background-size: 720px 525px;
width: 720px;
height: 525px;
}
......
Supports Markdown
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