Skip to content

GitLab

Commit e18913be authored by Gradl, Tobias's avatar Gradl, Tobias
Browse files

995: Upgrade underlying frameworks to current GS state 

Task-Url: https://pm.winseda.de/issues/995
parent 779989ef
Hide whitespace changes
Inline Side-by-side
css/application.css
View file @ e18913be
......@@ -64,83 +64,243 @@
}
/*!
* New "light" tables
* Recent functionality additions (no-refactor-zone)
*/
.table-light {
.inline-button {
cursor: pointer;
display: inline;
}
.inline-button:hover,
.inline-button:focus {
text-decoration: underline;
}
/*!
* Some basic table layout
*/
.default-table {
width: 100%;
margin: 5px 0;
}
.default-table tr {
border: 1px solid #ccc;
}
.default-table td,
.default-table th {
padding: 5px 10px;
/*border: 1px solid #ccc;*/
}
.default-table th {
text-align: right;
}
/*!
* State tables (wrapped details tables)
*/
.state-table {
border-collapse: separate;
border-spacing: 0 1px;
width: 100%;
}
.table-light tbody tr {
background-color: #fff;
.state-table tbody th,
.state-table tbody td {
border-top: 1px solid;
border-bottom: 1px solid;
font-weight: normal;
padding: 10px 5px;
}
.state-table tbody th {
border-left: 6px solid;
text-align: center;
}
.state-table tbody th.state-column {
width: 8em;
padding: 5px;
}
.state-table tbody td:last-child {
border-right: 1px solid;
}
.state-table tbody td.dataTables_empty {
border: 1px solid #ABABAB;
padding: 10px;
text-align: center;
}
.state-table.state-table-navigatable tbody th:last-child {
width: 30px;
padding: 10px;
background-color: white;
border-left: 1px solid;
border-top: none;
border-bottom: none;
}
.state-table tbody tr.state-row-default th,
.state-table tbody tr.state-row-default td {
border-color: #ABABAB;
}
table.state-table tbody tr.state-row-ok th,
table.state-table tbody tr.state-row-ok td {
border-color: #419641;
}
.state-table tbody tr.state-row-info > th,
.state-table tbody tr.state-row-info > td {
border-color: #2AABD2;
}
.state-table tbody tr.state-row-warning > th,
.state-table tbody tr.state-row-warning > td {
border-color: #EB9316;
}
.table-light tbody tr.active {
background-color: #f0f0f0;
.state-table tbody tr.state-row-danger > th,
.state-table tbody tr.state-row-danger > td,
.state-table tbody tr.state-row-error > th,
.state-table tbody tr.state-row-error > td {
border-color: #AC2925;
}
.table-light tbody tr:hover {
background-color: #f0f0f0;
.state-table.state-table-selectable tbody tr.state-row-default.active,
.state-table.state-table-selectable tbody tr.state-row-default:hover {
background-color: #F8F8F8;
}
.state-table.state-table-selectable tbody tr.state-row-ok.active,
.state-table.state-table-selectable tbody tr.state-row-ok:hover {
background-color: #F1FFF1;
}
.state-table.state-table-selectable tbody tr.state-row-info.active,
.state-table.state-table-selectable tbody tr.state-row-info:hover {
background-color: #EBFEFF;
}
.state-table.state-table-selectable tbody tr.state-row-warning.active,
.state-table.state-table-selectable tbody tr.state-row-warning:hover {
background-color: #fff4e6;
}
.state-table.state-table-selectable tbody tr.state-row-danger.active,
.state-table.state-table-selectable tbody tr.state-row-danger:hover,
.state-table.state-table-selectable tbody tr.state-row-error.active,
.state-table.state-table-selectable tbody tr.state-row-error:hover {
background-color: #FFEBEB;
}
.state-table.state-table-navigatable tbody tr:hover,
.state-table.state-table-selectable tbody tr:hover {
cursor: pointer;
}
.table-light tbody td {
padding: 5px;
.state-table.state-table-navigatable tbody tr.active th:last-child:before,
.state-table.state-table-navigatable tbody tr:hover th:last-child:before {
content: "\f061";
font-family: FontAwesome;
}
.state-table tr.group th,
.state-table tr.group td {
font-weight: bold;
padding: 10px 5px;
}
.table-light thead th {
border-bottom: 1px solid #DDD;
.state-table.state-table-selectable tbody tr.group td {
background-color: transparent;
}
.state-column {
text-align: center;
width: 6em;
.state-table.state-table-selectable tbody tr.group.state-row-default {
background-color: #D7D7D7;
}
.state-column.state-default { border-left: 6px solid #ABABAB; color: #ABABAB; }
.state-column.state-ok { border-left: 6px solid #419641; color: #419641; }
.state-column.state-info { border-left: 6px solid #2AABD2; color: #2AABD2; }
.state-column.state-warning { border-left: 6px solid #EB9316; color: #EB9316; }
.state-column.state-danger { border-left: 6px solid #AC2925; color: #AC2925; }
.content-column {
.state-table.state-table-selectable tbody tr.group.state-row-ok {
background-color: #9FD59F;
}
.cell-heading {
.state-table.state-table-selectable tbody tr.group.state-row-info {
background-color: #7ACFE7;
}
.cell-payload {
font-size: 90%;
color: #7f7f7f;
.state-table.state-table-selectable tbody tr.group.state-row-warning {
background-color: #F5AD46;
}
table.details-table td,
table.details-table th {
padding: 3px 5px;
.state-table.state-table-selectable tbody tr.group.state-row-danger,
.state-table.state-table-selectable tbody tr.group.state-row-error {
background-color: #F07975;
}
table.details-table td {
vertical-align: middle;
.state-table tr.group .group-heading {
font-size: 125%;
}
table.details-table th {
font-weight: normal;
color: #7f7f7f;
width: 140px;
vertical-align: top;
.state-default { color: #ABABAB; font-weight: normal; }
.state-ok { color: #419641; font-weight: normal; }
.state-info { color: #2AABD2; font-weight: bold; }
.state-warning { color: /*#EB9316*/#D97F00; font-weight: bold; }
.state-danger, .state-error { color: #AC2925; font-weight: bold; }
.state-table tbody td {
padding: 0px;
}
table.details-table .btn-link,
table.table-light .btn-link {
padding: 0;
.state-table tbody th:first-child {
width: 9em;
}
.state-table tbody th:first-child .fa {
margin-bottom: 8px;
}
.state-table tbody td.child {
border: 1px solid #ABABAB;
border-top: none;
border-bottom-width: 3px;
padding: 5px
}
.center {
text-align: center;
}
/* Specifics for inner (data) lists */
.state-table ul.inner-state-list {
width: 100%;
position: relative;
list-style-type: none;
margin: 0;
padding: 0;
}
.state-table ul.inner-state-list li {
padding: 4px 5px;
/*border-bottom: 1px solid #EEE;*/
}
.state-table ul.inner-state-list li .state-heading {
font-weight: bold;
}
.no-break-out {
/* These are technically the same, but use both */
overflow-wrap: break-word;
word-wrap: break-word;
-ms-word-break: break-all;
/* This is the dangerous one in WebKit, as it breaks things wherever */
......@@ -150,7 +310,7 @@ table.table-light .btn-link {
}
.previous-crawls {
max-height: 200px;
max-height: 300px;
overflow-y: scroll;
border: 1px solid #DEDEDE;
}
......@@ -197,7 +357,7 @@ a:active i {
}
.jumbotron h1 {
margin-top: 50px;
margin-top: 10px;
font-size: 3em;
}
......@@ -211,13 +371,6 @@ a:active i {
padding-top: 32px;
}
.search-home-info {
margin-top: 50px;
margin-bottom: 5px;
font-size: 120%;
font-style: italic;
}
.branded-side-logo {
margin: 25px;
text-align: right;
......@@ -225,6 +378,7 @@ a:active i {
.wordcloud {
text-align: center;
margin-top: 10px;
}
.wordcloud text:hover {
......@@ -253,14 +407,14 @@ a:active i {
}
div.panel.panel-search-result {
border-color: #56516b;
border-color: #002547;
}
div.panel.panel-search-result > .panel-heading {
background-color: #7e7b8c;
background-image: linear-gradient(to bottom, #7e7b8c 0%, #56516b 100%);
background-color: #002547;
/*background-image: linear-gradient(to bottom, #7e7b8c 0%, #56516b 100%);*/
color: #FFF;
border-color: #56516b;
border-color: #002547;
}
div.panel.panel-search-result > .panel-body {
......@@ -332,7 +486,7 @@ div.panel.panel-search-result > .panel-body {
.dataTables_wrapper table.dataTable tbody tr.selected {
background-color: #BFBDC6;
}
.td-no-wrap {
.td-no-wrap, .no-wrap {
white-space: nowrap;
}
......@@ -535,7 +689,7 @@ div.panel.panel-search-result > .panel-body {
}
.sidebar a.list-group-item {
color: #483E69;
color: #003564;
border-left: 3px solid #fff;
}
......@@ -624,7 +778,7 @@ div.panel.panel-search-result > .panel-body {
.dariah-flower-white-45 {
background-image: url("../img/dariah-flower-white-45.png");
padding: 26px 0 0 30px;
margin-top: 15px;
margin-top: -15px;
min-height: 45px;
font-size: 22px;
white-space: nowrap;
......@@ -651,9 +805,9 @@ div.panel.panel-search-result > .panel-body {
/*!
* Smaller jumbotron
*/
.jumbotron.jumbotron-small {
/*.jumbotron.jumbotron-small {
padding: 10px 0;
}
}*/
.jumbotron.jumbotron-small h1 {
font-size: 3em;
}
......
css/bootstrap/bootstrap-colorpicker.css 0 → 100755
View file @ e18913be
/*!
* Bootstrap Colorpicker
* http://mjolnic.github.io/bootstrap-colorpicker/
*
* Originally written by (c) 2012 Stefan Petre
* Licensed under the Apache License v2.0
* http://www.apache.org/licenses/LICENSE-2.0.txt
*
*/
.colorpicker-saturation {
float: left;
width: 100px;
height: 100px;
cursor: crosshair;
background-image: url("../../img/bootstrap-colorpicker/saturation.png");
}
.colorpicker-saturation i {
position: absolute;
top: 0;
left: 0;
display: block;
width: 5px;
height: 5px;
margin: -4px 0 0 -4px;
border: 1px solid #000;
-webkit-border-radius: 5px;
-moz-border-radius: 5px;
border-radius: 5px;
}
.colorpicker-saturation i b {
display: block;
width: 5px;
height: 5px;
border: 1px solid #fff;
-webkit-border-radius: 5px;
-moz-border-radius: 5px;
border-radius: 5px;
}
.colorpicker-hue,
.colorpicker-alpha {
float: left;
width: 15px;
height: 100px;
margin-bottom: 4px;
margin-left: 4px;
cursor: row-resize;
}
.colorpicker-hue i,
.colorpicker-alpha i {
position: absolute;
top: 0;
left: 0;
display: block;
width: 100%;
height: 1px;
margin-top: -1px;
background: #000;
border-top: 1px solid #fff;
}
.colorpicker-hue {
background-image: url("../../img/bootstrap-colorpicker/hue.png");
}
.colorpicker-alpha {
display: none;
background-image: url("../../img/bootstrap-colorpicker/alpha.png");
}
.colorpicker {
top: 0;
left: 0;
z-index: 2500;
min-width: 130px;
padding: 4px;
margin-top: 1px;
-webkit-border-radius: 4px;
-moz-border-radius: 4px;
border-radius: 4px;
*zoom: 1;
}
.colorpicker:before,
.colorpicker:after {
display: table;
line-height: 0;
content: "";
}
.colorpicker:after {
clear: both;
}
.colorpicker:before {
position: absolute;
top: -7px;
left: 6px;
display: inline-block;
border-right: 7px solid transparent;
border-bottom: 7px solid #ccc;
border-left: 7px solid transparent;
border-bottom-color: rgba(0, 0, 0, 0.2);
content: '';
}
.colorpicker:after {
position: absolute;
top: -6px;
left: 7px;
display: inline-block;
border-right: 6px solid transparent;
border-bottom: 6px solid #ffffff;
border-left: 6px solid transparent;
content: '';
}
.colorpicker div {
position: relative;
}
.colorpicker.colorpicker-with-alpha {
min-width: 140px;
}
.colorpicker.colorpicker-with-alpha .colorpicker-alpha {
display: block;
}
.colorpicker-color {
height: 10px;
margin-top: 5px;
clear: both;
background-image: url("../../img/bootstrap-colorpicker/alpha.png");
background-position: 0 100%;
}
.colorpicker-color div {
height: 10px;
}
.colorpicker-element .input-group-addon i,
.colorpicker-element .add-on i {
display: inline-block;
width: 16px;
height: 16px;
vertical-align: text-top;
cursor: pointer;
}
.colorpicker.colorpicker-inline {
position: relative;
z-index: auto;
display: inline-block;
float: none;
}
.colorpicker.colorpicker-horizontal {
width: 110px;
height: auto;
min-width: 110px;
}
.colorpicker.colorpicker-horizontal .colorpicker-saturation {
margin-bottom: 4px;
}
.colorpicker.colorpicker-horizontal .colorpicker-color {
width: 100px;
}
.colorpicker.colorpicker-horizontal .colorpicker-hue,
.colorpicker.colorpicker-horizontal .colorpicker-alpha {
float: left;
width: 100px;
height: 15px;
margin-bottom: 4px;
margin-left: 0;
cursor: col-resize;
}
.colorpicker.colorpicker-horizontal .colorpicker-hue i,
.colorpicker.colorpicker-horizontal .colorpicker-alpha i {
position: absolute;
top: 0;
left: 0;
display: block;
width: 1px;
height: 15px;
margin-top: 0;
background: #ffffff;
border: none;
}
.colorpicker.colorpicker-horizontal .colorpicker-hue {
background-image: url("../../img/bootstrap-colorpicker/hue-horizontal.png");
}
.colorpicker.colorpicker-horizontal .colorpicker-alpha {
background-image: url("../../img/bootstrap-colorpicker/alpha-horizontal.png");
}
.colorpicker.colorpicker-hidden {
display: none;
}
.colorpicker.colorpicker-visible {
display: block;
}
.colorpicker-inline.colorpicker-visible {
display: inline-block;
}
\ No newline at end of file
css/bootstrap/bootstrap-customization.css
View file @ e18913be
......@@ -10,7 +10,18 @@
url('../../fonts/museosansrounded_700_macroman/MuseoSansRounded-700-webfont.ttf') format('truetype'),
url('../../fonts/museosansrounded_700_macroman/MuseoSansRounded-700-webfont.svg#webfontAhOK7zbK') format('svg');
font-weight: normal;
font-style: normal;
font-style: normal;
/** MWW-specific */
/*font-family: "Open Sans", sans-serif;
font-weight: normal;
font-style: normal;*/
}
@font-face {
font-family: 'Glyphicons Halflings';
src: url('../../fonts/glyphicons-halflings/glyphicons-halflings-regular.eot');
src: url('../../fonts/glyphicons-halflings/glyphicons-halflings-regular.eot?#iefix') format('embedded-opentype'), url('../../fonts/glyphicons-halflings/glyphicons-halflings-regular.woff2') format('woff2'), url('../../fonts/glyphicons-halflings/glyphicons-halflings-regular.woff') format('woff'), url('../../fonts/glyphicons-halflings/glyphicons-halflings-regular.ttf') format('truetype'), url('../../fonts/glyphicons-halflings/glyphicons-halflings-regular.svg#glyphicons_halflingsregular') format('svg');
}
body {
......@@ -43,20 +54,25 @@ body {
/*!
* Navbar and Navs
*/
.navbar {
/*.navbar {
-webkit-box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2);
box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2);
}
}*/