Skip to content

Commit

Permalink
[FRT] Merged sass directory "bootstrap" into "components"
Browse files Browse the repository at this point in the history
  • Loading branch information
conversion authored and mbeh-ub committed Dec 16, 2016
1 parent 581d6e0 commit 28fd7d2
Show file tree
Hide file tree
Showing 9 changed files with 116 additions and 117 deletions.
220 changes: 110 additions & 110 deletions themes/freiburg/css/freiburg2.css
Original file line number Diff line number Diff line change
Expand Up @@ -6533,116 +6533,6 @@ mark.hit, mark, .hightlight {
float: none !important;
}
}
/* line 2, ../lib/sass/ubfr/rdsui/bootstrap/_dl-horizontal.scss */
.dl-horizontal dt {
text-align: left;
}

/* line 1, ../lib/sass/ubfr/rdsui/bootstrap/_form-control.scss */
.form-control {
-webkit-border-radius: 0;
-moz-border-radius: 0;
border-radius: 0;
}

/* line 6, ../lib/sass/ubfr/rdsui/bootstrap/_form-control.scss */
.invert .form-control {
border: none;
}

/* line 1, ../lib/sass/ubfr/rdsui/bootstrap/_btn.scss */
.btn {
-webkit-border-radius: 0;
-moz-border-radius: 0;
border-radius: 0;
font-size: 1em;
font-weight: 700;
background-color: #e5dfd6;
color: #655e5e;
}
/* line 8, ../lib/sass/ubfr/rdsui/bootstrap/_btn.scss */
.btn:hover, .btn:focus {
background-color: #28afe1;
}
/* line 13, ../lib/sass/ubfr/rdsui/bootstrap/_btn.scss */
.btn.btn-primary:hover, .btn.btn-default:hover {
color: #FFF;
}
/* line 15, ../lib/sass/ubfr/rdsui/bootstrap/_btn.scss */
.btn.btn-primary:hover .icon, .btn.btn-default:hover .icon {
color: #FFF;
}

/* line 24, ../lib/sass/ubfr/rdsui/bootstrap/_btn.scss */
.btn .icon {
-webkit-transition: all 0.4s 0s ease;
-moz-transition: all 0.4s 0s ease;
-ms-transition: all 0.4s 0s ease;
-o-transition: all 0.4s 0s ease;
transition: all 0.4s 0s ease;
padding-left: 7px;
color: #28afe1;
}

/* line 32, ../lib/sass/ubfr/rdsui/bootstrap/_btn.scss */
.button-row .btn {
margin: 0 5px;
}
/* line 35, ../lib/sass/ubfr/rdsui/bootstrap/_btn.scss */
.button-row .btn:first-child {
margin-left: 0;
}
/* line 38, ../lib/sass/ubfr/rdsui/bootstrap/_btn.scss */
.button-row .btn:last-child {
margin-right: 0;
}

/* line 1, ../lib/sass/ubfr/rdsui/bootstrap/_alerts.scss */
.alert {
padding: 17px;
margin-bottom: 4px;
}

/* line 5, ../lib/sass/ubfr/rdsui/bootstrap/_alerts.scss */
.alert-info {
background: none;
border: none;
color: #645e5e;
}
/* line 10, ../lib/sass/ubfr/rdsui/bootstrap/_alerts.scss */
.alert-info a {
font-weight: 700;
}

/* line 9, ../lib/sass/ubfr/rdsui/bootstrap/_modal.scss */
.modal-content {
border-radius: 0;
border: none;
-webkit-box-shadow: none;
-moz-box-shadow: none;
box-shadow: none;
}

/* line 17, ../lib/sass/ubfr/rdsui/bootstrap/_modal.scss */
.modal-header {
background: #28afe1;
color: #FFF;
font-family: "Klint W02", sans-serif;
font-weight: 700;
font-size: 1.333em;
padding: 10px 17px;
}
/* line 25, ../lib/sass/ubfr/rdsui/bootstrap/_modal.scss */
.modal-header button.close {
color: #FFF;
font-size: 18px;
margin-top: 8px;
-webkit-opacity: 1;
-moz-opacity: 1;
opacity: 1;
filter: alpha(opacity=100);
}

/* line 3, ../lib/sass/ubfr/rdsui/_typography.scss */
.results-listing .panel-group .panel-body {
font-size: 0.889em;
Expand Down Expand Up @@ -7178,6 +7068,116 @@ div.row .sidebar h4 {
margin: 5px 0;
}

/* line 2, ../lib/sass/ubfr/rdsui/components/_dl-horizontal.scss */
.dl-horizontal dt {
text-align: left;
}

/* line 1, ../lib/sass/ubfr/rdsui/components/_form-control.scss */
.form-control {
-webkit-border-radius: 0;
-moz-border-radius: 0;
border-radius: 0;
}

/* line 6, ../lib/sass/ubfr/rdsui/components/_form-control.scss */
.invert .form-control {
border: none;
}

/* line 1, ../lib/sass/ubfr/rdsui/components/_btn.scss */
.btn {
-webkit-border-radius: 0;
-moz-border-radius: 0;
border-radius: 0;
font-size: 1em;
font-weight: 700;
background-color: #e5dfd6;
color: #655e5e;
}
/* line 8, ../lib/sass/ubfr/rdsui/components/_btn.scss */
.btn:hover, .btn:focus {
background-color: #28afe1;
}
/* line 13, ../lib/sass/ubfr/rdsui/components/_btn.scss */
.btn.btn-primary:hover, .btn.btn-default:hover {
color: #FFF;
}
/* line 15, ../lib/sass/ubfr/rdsui/components/_btn.scss */
.btn.btn-primary:hover .icon, .btn.btn-default:hover .icon {
color: #FFF;
}

/* line 24, ../lib/sass/ubfr/rdsui/components/_btn.scss */
.btn .icon {
-webkit-transition: all 0.4s 0s ease;
-moz-transition: all 0.4s 0s ease;
-ms-transition: all 0.4s 0s ease;
-o-transition: all 0.4s 0s ease;
transition: all 0.4s 0s ease;
padding-left: 7px;
color: #28afe1;
}

/* line 32, ../lib/sass/ubfr/rdsui/components/_btn.scss */
.button-row .btn {
margin: 0 5px;
}
/* line 35, ../lib/sass/ubfr/rdsui/components/_btn.scss */
.button-row .btn:first-child {
margin-left: 0;
}
/* line 38, ../lib/sass/ubfr/rdsui/components/_btn.scss */
.button-row .btn:last-child {
margin-right: 0;
}

/* line 1, ../lib/sass/ubfr/rdsui/components/_alerts.scss */
.alert {
padding: 17px;
margin-bottom: 4px;
}

/* line 5, ../lib/sass/ubfr/rdsui/components/_alerts.scss */
.alert-info {
background: none;
border: none;
color: #645e5e;
}
/* line 10, ../lib/sass/ubfr/rdsui/components/_alerts.scss */
.alert-info a {
font-weight: 700;
}

/* line 9, ../lib/sass/ubfr/rdsui/components/_modal.scss */
.modal-content {
border-radius: 0;
border: none;
-webkit-box-shadow: none;
-moz-box-shadow: none;
box-shadow: none;
}

/* line 17, ../lib/sass/ubfr/rdsui/components/_modal.scss */
.modal-header {
background: #28afe1;
color: #FFF;
font-family: "Klint W02", sans-serif;
font-weight: 700;
font-size: 1.333em;
padding: 10px 17px;
}
/* line 25, ../lib/sass/ubfr/rdsui/components/_modal.scss */
.modal-header button.close {
color: #FFF;
font-size: 18px;
margin-top: 8px;
-webkit-opacity: 1;
-moz-opacity: 1;
opacity: 1;
filter: alpha(opacity=100);
}

/* line 1, ../lib/sass/ubfr/rdsui/pageLayout/_general.scss */
body.page-layout-catalog-default {
background: #eeedec url("../images/lines-bg-pattern.svg") repeat;
Expand Down
5 changes: 0 additions & 5 deletions themes/freiburg/lib/sass/ubfr/rdsui/bootstrap/_all.scss

This file was deleted.

7 changes: 6 additions & 1 deletion themes/freiburg/lib/sass/ubfr/rdsui/components/_all.scss
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,9 @@
@import "checkbox-filter";
@import "sidebar-note";
@import "sidebar-content-box";
@import "rds-dl";
@import "rds-dl";
@import "dl-horizontal";
@import "form-control";
@import "btn";
@import "alerts";
@import "modal";
1 change: 0 additions & 1 deletion themes/freiburg/lib/sass/ubfr/rdsui/freiburg2.scss
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@


@import "local-settings";
@import "bootstrap/all";
@import "typography";
@import "components/all";
@import "pageLayout/all";
Expand Down

0 comments on commit 28fd7d2

Please sign in to comment.