Skip to content

GitLab

Commit 8b6b68e6 authored by olga's avatar olga Committed by Alex Pyrgiotis
Browse files
Options

admin-ui: Associations h2 in details & style fixes

parent 9b7a5d22
Show whitespace changes
Inline Side-by-side
Showing with 136 additions and 103 deletions
snf-admin-app/synnefo_admin/admin/static/css/bootstrap.css
View file @ 8b6b68e6
......@@ -391,7 +391,7 @@ body {
font-size: 14px;
line-height: 1.42857;
color: white;
background-color: #404040;
background-color: #303030;
}
/* line 39, ../sass/bootstrap/_scaffolding.scss */
......@@ -402,7 +402,7 @@ textarea {
font-family: inherit;
font-size: inherit;
line-height: inherit;
color: #404040;
color: #303030;
}
/* line 49, ../sass/bootstrap/_scaffolding.scss */
......@@ -412,7 +412,7 @@ a {
}
/* line 54, ../sass/bootstrap/_scaffolding.scss */
a:hover, a:focus {
color: #77b1e1;
color: #83b8e4;
}
/* line 58, ../sass/bootstrap/_scaffolding.scss */
a:focus {
......@@ -447,7 +447,7 @@ img {
.img-thumbnail {
padding: 4px;
line-height: 1.42857;
background-color: #404040;
background-color: #303030;
border: 1px solid #dddddd;
border-radius: 0;
-webkit-transition: all 0.2s ease-in-out;
......@@ -507,7 +507,7 @@ h6 .small,
.h6 .small {
font-weight: normal;
line-height: 1;
color: #5a5959;
color: #4e4e4e;
}
/* line 26, ../sass/bootstrap/_type.scss */
......@@ -632,7 +632,7 @@ cite {
/* line 91, ../sass/bootstrap/_type.scss */
.text-muted {
color: #5a5959;
color: #4e4e4e;
}
/* line 606, ../sass/bootstrap/_mixins.scss */
......@@ -829,7 +829,7 @@ dd {
abbr[title],
abbr[data-original-title] {
cursor: help;
border-bottom: 1px dotted #5a5959;
border-bottom: 1px dotted #4e4e4e;
}
/* line 215, ../sass/bootstrap/_type.scss */
......@@ -858,7 +858,7 @@ blockquote .small {
display: block;
font-size: 80%;
line-height: 1.42857;
color: #5a5959;
color: #4e4e4e;
}
/* line 245, ../sass/bootstrap/_type.scss */
blockquote footer:before,
......@@ -945,7 +945,7 @@ pre {
line-height: 1.42857;
word-break: break-all;
word-wrap: break-word;
color: #404040;
color: #303030;
background-color: whitesmoke;
border: 1px solid #cccccc;
border-radius: 0;
......@@ -2132,7 +2132,7 @@ th {
}
/* line 56, ../sass/bootstrap/_tables.scss */
.table .table {
background-color: #404040;
background-color: #303030;
}
/* line 70, ../sass/bootstrap/_tables.scss */
......@@ -2361,7 +2361,7 @@ legend {
margin-bottom: 20px;
font-size: 21px;
line-height: inherit;
color: #404040;
color: #303030;
border: 0;
border-bottom: 1px solid #e5e5e5;
}
......@@ -2451,16 +2451,16 @@ output {
}
/* line 57, ../sass/bootstrap/_mixins.scss */
.form-control::-moz-placeholder {
color: #5a5959;
color: #4e4e4e;
opacity: 1;
}
/* line 59, ../sass/bootstrap/_mixins.scss */
.form-control:-ms-input-placeholder {
color: #5a5959;
color: #4e4e4e;
}
/* line 60, ../sass/bootstrap/_mixins.scss */
.form-control::-webkit-input-placeholder {
color: #5a5959;
color: #4e4e4e;
}
/* line 142, ../sass/bootstrap/_forms.scss */
.form-control[disabled], .form-control[readonly], fieldset[disabled] .form-control {
......@@ -3122,13 +3122,13 @@ select[multiple].input-lg,
}
/* line 105, ../sass/bootstrap/_buttons.scss */
.btn-link:hover, .btn-link:focus {
color: #77b1e1;
color: #83b8e4;
text-decoration: underline;
background-color: transparent;
}
/* line 113, ../sass/bootstrap/_buttons.scss */
.btn-link[disabled]:hover, .btn-link[disabled]:focus, fieldset[disabled] .btn-link:hover, fieldset[disabled] .btn-link:focus {
color: #5a5959;
color: #4e4e4e;
text-decoration: none;
}
......@@ -4286,14 +4286,14 @@ input[type="button"].btn-block {
clear: both;
font-weight: normal;
line-height: 1.42857;
color: #404040;
color: #303030;
white-space: nowrap;
}
/* line 76, ../sass/bootstrap/_dropdowns.scss */
.dropdown-menu > li > a:hover, .dropdown-menu > li > a:focus {
text-decoration: none;
color: #333333;
color: #232323;
background-color: whitesmoke;
}
......@@ -4307,7 +4307,7 @@ input[type="button"].btn-block {
/* line 102, ../sass/bootstrap/_dropdowns.scss */
.dropdown-menu > .disabled > a, .dropdown-menu > .disabled > a:hover, .dropdown-menu > .disabled > a:focus {
color: #5a5959;
color: #4e4e4e;
}
/* line 109, ../sass/bootstrap/_dropdowns.scss */
......@@ -4346,7 +4346,7 @@ input[type="button"].btn-block {
padding: 3px 20px;
font-size: 12px;
line-height: 1.42857;
color: #5a5959;
color: #4e4e4e;
}
/* line 160, ../sass/bootstrap/_dropdowns.scss */
......@@ -4805,11 +4805,11 @@ input[type="button"].btn-block {
}
/* line 31, ../sass/bootstrap/_navs.scss */
.nav > li.disabled > a {
color: #5a5959;
color: #4e4e4e;
}
/* line 35, ../sass/bootstrap/_navs.scss */
.nav > li.disabled > a:hover, .nav > li.disabled > a:focus {
color: #5a5959;
color: #4e4e4e;
text-decoration: none;
background-color: transparent;
cursor: not-allowed;
......@@ -4854,7 +4854,7 @@ input[type="button"].btn-block {
/* line 98, ../sass/bootstrap/_navs.scss */
.nav-tabs > li.active > a, .nav-tabs > li.active > a:hover, .nav-tabs > li.active > a:focus {
color: #555555;
background-color: #404040;
background-color: #303030;
border: 1px solid #dddddd;
border-bottom-color: transparent;
cursor: default;
......@@ -4947,7 +4947,7 @@ input[type="button"].btn-block {
.nav-tabs.nav-justified > .active > a:hover,
.nav-tabs-justified > .active > a:focus,
.nav-tabs.nav-justified > .active > a:focus {
border-bottom-color: #404040;
border-bottom-color: #303030;
}
}
......@@ -5414,7 +5414,7 @@ input[type="button"].btn-block {
}
/* line 507, ../sass/bootstrap/_navbar.scss */
.navbar-inverse .navbar-brand {
color: #5a5959;
color: #4e4e4e;
}
/* line 510, ../sass/bootstrap/_navbar.scss */
.navbar-inverse .navbar-brand:hover, .navbar-inverse .navbar-brand:focus {
......@@ -5423,11 +5423,11 @@ input[type="button"].btn-block {
}
/* line 516, ../sass/bootstrap/_navbar.scss */
.navbar-inverse .navbar-text {
color: #5a5959;
color: #4e4e4e;
}
/* line 521, ../sass/bootstrap/_navbar.scss */
.navbar-inverse .navbar-nav > li > a {
color: #5a5959;
color: #4e4e4e;
}
/* line 525, ../sass/bootstrap/_navbar.scss */
.navbar-inverse .navbar-nav > li > a:hover, .navbar-inverse .navbar-nav > li > a:focus {
......@@ -5477,7 +5477,7 @@ input[type="button"].btn-block {
}
/* line 585, ../sass/bootstrap/_navbar.scss */
.navbar-inverse .navbar-nav .open .dropdown-menu > li > a {
color: #5a5959;
color: #4e4e4e;
}
/* line 588, ../sass/bootstrap/_navbar.scss */
.navbar-inverse .navbar-nav .open .dropdown-menu > li > a:hover, .navbar-inverse .navbar-nav .open .dropdown-menu > li > a:focus {
......@@ -5497,7 +5497,7 @@ input[type="button"].btn-block {
}
/* line 613, ../sass/bootstrap/_navbar.scss */
.navbar-inverse .navbar-link {
color: #5a5959;
color: #4e4e4e;
}
/* line 615, ../sass/bootstrap/_navbar.scss */
.navbar-inverse .navbar-link:hover {
......@@ -5524,7 +5524,7 @@ input[type="button"].btn-block {
}
/* line 23, ../sass/bootstrap/_breadcrumbs.scss */
.breadcrumb > .active {
color: #5a5959;
color: #4e4e4e;
}
/* line 4, ../sass/bootstrap/_pagination.scss */
......@@ -5568,7 +5568,7 @@ input[type="button"].btn-block {
.pagination > li > a:hover, .pagination > li > a:focus,
.pagination > li > span:hover,
.pagination > li > span:focus {
color: #77b1e1;
color: #83b8e4;
background-color: #d9d9d9;
border-color: #dddddd;
}
......@@ -5590,7 +5590,7 @@ input[type="button"].btn-block {
.pagination > .disabled > a,
.pagination > .disabled > a:hover,
.pagination > .disabled > a:focus {
color: #5a5959;
color: #4e4e4e;
background-color: white;
border-color: #dddddd;
cursor: not-allowed;
......@@ -5684,7 +5684,7 @@ input[type="button"].btn-block {
.pager .disabled > a:hover,
.pager .disabled > a:focus,
.pager .disabled > span {
color: #5a5959;
color: #4e4e4e;
background-color: white;
cursor: not-allowed;
}
......@@ -5695,7 +5695,7 @@ input[type="button"].btn-block {
padding: .2em .6em .3em;
font-size: 13px;
line-height: 1;
color: #404040;
color: #303030;
text-align: center;
white-space: nowrap;
vertical-align: baseline;
......@@ -5790,7 +5790,7 @@ input[type="button"].btn-block {
vertical-align: baseline;
white-space: nowrap;
text-align: center;
background-color: #5a5959;
background-color: #4e4e4e;
border-radius: 0;
}
/* line 22, ../sass/bootstrap/_badges.scss */
......@@ -5877,7 +5877,7 @@ a.list-group-item.active > .badge,
padding: 4px;
margin-bottom: 20px;
line-height: 1.42857;
background-color: #404040;
background-color: #303030;
border: 1px solid #dddddd;
border-radius: 0;
-webkit-transition: all 0.2s ease-in-out;
......@@ -6585,7 +6585,7 @@ a.list-group-item-danger.active, a.list-group-item-danger.active:hover, a.list-g
}
/* line 407, ../sass/bootstrap/_mixins.scss */
.panel-default > .panel-heading {
color: #404040;
color: #303030;
background-color: whitesmoke;
border-color: #dddddd;
}
......
snf-admin-app/synnefo_admin/admin/static/css/extra.css
View file @ 8b6b68e6
......@@ -112,7 +112,7 @@ body .container .line-btn.disabled:hover {
/* line 147, ../sass/_bars-btns.scss */
.navbar a {
color: #404040;
color: #303030;
}
/* line 151, ../sass/_bars-btns.scss */
......@@ -203,7 +203,7 @@ body .container .line-btn.disabled:hover {
}
/* line 235, ../sass/_bars-btns.scss */
.login-info .dropdown:hover > a {
color: #404040;
color: #303030;
background: white;
}
/* line 242, ../sass/_bars-btns.scss */
......@@ -222,7 +222,7 @@ body .container .line-btn.disabled:hover {
/* line 266, ../sass/_bars-btns.scss */
.label-notice {
background: #5a5959;
background: #4e4e4e;
}
/* line 270, ../sass/_bars-btns.scss */
......@@ -2497,7 +2497,7 @@ Extra-button is used to show total selected rows
.object-details-content .nav-tabs > li.active > a {
opacity: 1;
border-color: transparent;
background: #5a5959;
background: #4e4e4e;
color: white;
border-radius: 0;
}
......@@ -2515,43 +2515,50 @@ Extra-button is used to show total selected rows
}
/* line 119, ../sass/_details.scss */
.part-two h2 {
font-size: 24px;
margin-bottom: 2em;
padding-top: 1em;
border-top: 2px solid #818181;
}
/* line 126, ../sass/_details.scss */
.part-two > .object-details {
border-top: 2px solid #8d8c8c;
background: #484848;
border-bottom: 2px solid #818181;
background: #383838;
padding: 14px 20px;
}
/* line 123, ../sass/_details.scss */
/* line 130, ../sass/_details.scss */
.part-two > .object-details .object-details {
padding: 5px 20px;
}
/* line 125, ../sass/_details.scss */
/* line 132, ../sass/_details.scss */
.part-two > .object-details .object-details:hover {
background: #4d4d4d;
background: #3d3d3d;
}
/* line 130, ../sass/_details.scss */
/* line 137, ../sass/_details.scss */
.part-two > .object-details .custom-btn span {
padding: 5px;
}
/* line 142, ../sass/_details.scss */
.part-two .object-details-content {
padding: 0 35px;
}
/* line 134, ../sass/_details.scss */
.part-two .custom-btn span {
padding: 5px;
}
/* line 166, ../sass/_details.scss */
/* line 174, ../sass/_details.scss */
.show-hide-all span.snf-font-arrow-up {
display: none;
padding: 0;
}
/* line 171, ../sass/_details.scss */
/* line 179, ../sass/_details.scss */
.show-hide-all span.snf-font-arrow-down {
display: inline;
padding: 0;
}
/* line 177, ../sass/_details.scss */
/* line 185, ../sass/_details.scss */
.show-hide-all.open .snf-font-arrow-up {
display: inline;
}
/* line 180, ../sass/_details.scss */
/* line 188, ../sass/_details.scss */
.show-hide-all.open .snf-font-arrow-down {
display: none;
}
......@@ -2597,7 +2604,7 @@ Extra-button is used to show total selected rows
line-height: 30px;
border: 0 none;
padding: 0 10px;
color: #404040;
color: #303030;
background: transparent;
font-weight: normal;
}
......@@ -2631,7 +2638,7 @@ Extra-button is used to show total selected rows
}
/* line 76, ../sass/_filters.scss */
.filter-dropdown .dropdown a {
color: #404040;
color: #303030;
}
/* line 79, ../sass/_filters.scss */
.filter-dropdown .dropdown .dropdown-menu {
......@@ -2666,7 +2673,7 @@ p.progress-area {
/* line 6, ../sass/_modals.scss */
.in-progress .modal-body {
background-color: #8d8c8c;
background-color: #818181;
}
/* line 8, ../sass/_modals.scss */
.in-progress .modal-body p.progress-area {
......@@ -2726,8 +2733,8 @@ p.progress-area {
/* line 65, ../sass/_modals.scss */
.modal .modal-footer .custom-btn:first-child {
float: left;
background-color: #404040;
border-color: #404040;
background-color: #303030;
border-color: #303030;
}
/* line 75, ../sass/_modals.scss */
......@@ -2741,7 +2748,7 @@ p.progress-area {
}
/* line 83, ../sass/_modals.scss */
.modal[data-karma="dark"] .elem {
color: #5a5959;
color: #4e4e4e;
}
/* line 88, ../sass/_modals.scss */
.modal[data-karma="neutral"] .elem {
......@@ -2795,7 +2802,7 @@ p.progress-area {
/* line 144, ../sass/_modals.scss */
.modal .popover h2 {
font-size: 16px;
color: #404040;
color: #303030;
font-weight: bold;
text-align: center;
}
......@@ -2803,7 +2810,7 @@ p.progress-area {
/* line 154, ../sass/_modals.scss */
.modal-content {
padding: 20px;
color: #404040;
color: #303030;
}
/* line 157, ../sass/_modals.scss */
.modal-content .badge {
......@@ -2967,7 +2974,7 @@ table:not(.table-selected) td:last-child dl {
#table-items-selected_filter input {
display: inline-block;
margin-left: 8px;
color: #404040;
color: #303030;
outline: none;
padding: 5px;
border: 0 none;
......@@ -3015,25 +3022,25 @@ table.dataTable tbody tr {
}
/* line 120, ../sass/_tables.scss */
table.dataTable tbody tr.even {
background-color: #4d4d4d;
background-color: #3d3d3d;
}
/* line 126, ../sass/_tables.scss */
table.dataTable thead th,
table.dataTable thead td {
border-bottom: 1px solid white;
border-top: 1px solid gray;
border-top: 1px solid #707070;
}
/* line 130, ../sass/_tables.scss */
table.dataTable tbody tr:hover {
background-color: #5f5f5f;
background-color: #4f4f4f;
}
/* line 133, ../sass/_tables.scss */
table.dataTable tbody tr.selected {
background-color: #eeeeee;
color: #404040;
color: #303030;
}
/* line 140, ../sass/_tables.scss */
......@@ -3070,7 +3077,7 @@ table.dataTable.no-footer {
/* line 170, ../sass/_tables.scss */
.container .dataTables_wrapper .dataTables_paginate .paginate_button:hover {
background: #404040;
background: #303030;
border-color: white;
}
......@@ -3093,7 +3100,7 @@ table.dataTable.no-footer {
/* line 189, ../sass/_tables.scss */
.dataTables_wrapper .dataTables_processing {
background: #5a5959;
background: #4e4e4e;
color: white;
padding: 5px 10px;
-webkit-box-shadow: inset 0 0 5px #888888;
......@@ -3435,7 +3442,7 @@ svg > text:last-child {
.nav > li > a:hover,
.nav > li > a:focus,
.nav > li:hover > a {
color: #404040;
color: #303030;
-webkit-transition: all 0 ease 0;
transition: all 0 ease 0;
background: #d9d9d9;
......@@ -3451,7 +3458,7 @@ svg > text:last-child {
/* line 204, ../sass/extra.scss */
.nav > li.active > a {
color: #404040;
color: #303030;
-webkit-transition: all 0 ease 0;
transition: all 0 ease 0;
background: white;
......@@ -3467,7 +3474,7 @@ svg > text:last-child {
.dropdown-menu {
border-radius: 0;
border: 0 none;
border-top: 1px solid #5a5959;
border-top: 1px solid #4e4e4e;
background-color: white;
}
......@@ -3475,18 +3482,18 @@ svg > text:last-child {
.dropdown-menu .active > a,
.dropdown-menu .active > a:hover {
background-color: #d9d9d9;
color: #404040;
color: #303030;
}
/* line 230, ../sass/extra.scss */
.dropdown-menu li > a:hover {
background-color: #d9d9d9;
color: #404040;
color: #303030;
}
/* line 235, ../sass/extra.scss */
.sub-nav {
background: #5a5959;
background: #4e4e4e;
border: 0 none;
}
/* line 239, ../sass/extra.scss */
......@@ -3495,17 +3502,17 @@ svg > text:last-child {
}
/* line 243, ../sass/extra.scss */
.sub-nav .nav > li:hover a {
color: #404040;
color: #303030;
}
/* line 250, ../sass/extra.scss */
.tab-content {
background: #5a5959;
background: #4e4e4e;
padding: 20px;
}
/* line 253, ../sass/extra.scss */
.tab-content .well {
border-color: #5a5959;
border-color: #4e4e4e;
}
/* line 259, ../sass/extra.scss */
......@@ -3527,7 +3534,7 @@ svg > text:last-child {
position: fixed;
bottom: 0px;
background: white;
color: #404040;
color: #303030;
}
/* line 278, ../sass/extra.scss */
.notify .container > *:not(:last-child) {
......@@ -3568,14 +3575,14 @@ svg > text:last-child {
.notify .warning {
font-style: italic;
font-weight: bold;
color: #5a5959;
color: #4e4e4e;
}
/* line 312, ../sass/extra.scss */
.notify .close-notify {
position: absolute;
right: 20px;
top: 20px;
color: #404040;
color: #303030;
}
/* line 317, ../sass/extra.scss */
.notify .close-notify:hover {
......
snf-admin-app/synnefo_admin/admin/static/js/details.js
View file @ 8b6b68e6
......@@ -207,5 +207,4 @@ $('.main .object-details h4 .arrow').trigger('click')
}
});
});