summaryrefslogtreecommitdiff
path: root/themes
diff options
context:
space:
mode:
authormsquare <msquare@notrademark.de>2017-06-20 16:50:21 +0200
committermsquare <msquare@notrademark.de>2017-06-20 16:50:21 +0200
commit56814fa2fdf58b4013f4d57c5ea87619c7122957 (patch)
tree640945769b7e9626cdf43162c786147f5c962029 /themes
parenta5fc5bd0979e8de1fce8a8addd351a6e7bd6aeb8 (diff)
parentcd30017b97afc3c7001fbb9eb14b54dbb980b7b6 (diff)
Merge branch 'pr/316' into feature-igel-rewrite
Diffstat (limited to 'themes')
m---------themes/assets/bootstrap0
-rw-r--r--themes/base.less138
-rw-r--r--themes/theme1.less2
-rw-r--r--themes/theme2.less2
-rw-r--r--themes/theme3.less2
-rw-r--r--themes/theme4.less2
6 files changed, 73 insertions, 73 deletions
diff --git a/themes/assets/bootstrap b/themes/assets/bootstrap
deleted file mode 160000
-Subproject ad716b9ea9506456f28e2c1bcdd7b4a81b44c11
diff --git a/themes/base.less b/themes/base.less
index 2bee2187..766679bb 100644
--- a/themes/base.less
+++ b/themes/base.less
@@ -1,6 +1,6 @@
-@import "assets/bootstrap/less/bootstrap";
+@import "../vendor/twbs/bootstrap/less/bootstrap";
-@icon-font-path: "../../../../vendor/bootstrap/fonts/";
+@icon-font-path: "../vendor/bootstrap/fonts/";
body {
padding-top: 50px;
@@ -11,14 +11,14 @@ body {
}
.first {
- margin-top: 30px;
+ margin-top: 30px;
}
.text-big {
- display: block;
- font-size: 30px;
- line-height: 30px;
- margin: 0px;
+ display: block;
+ font-size: 30px;
+ line-height: 30px;
+ margin: 0px;
}
.panel-primary .panel-heading a {
@@ -51,51 +51,51 @@ body {
flex-wrap: nowrap;
align-itmes: stretch;
width: 100%;
-
- .lane {
- background: @table-bg-accent;
- flex-grow: 1;
- min-width: 280px;
- width: 280px;
- flex-shrink: 1;
-
- .header {
- background: @panel-bg;
- border-bottom: 1px solid @table-border-color;
- height: 30px;
- padding: 5px 5px 5px 16px;
- }
-
- .tick {
- height: 30px;
- border-top: 1px solid darken(@table-bg-accent, 2%);
- }
-
+
+ .lane {
+ background: @table-bg-accent;
+ flex-grow: 1;
+ min-width: 280px;
+ width: 280px;
+ flex-shrink: 1;
+
+ .header {
+ background: @panel-bg;
+ border-bottom: 1px solid @table-border-color;
+ height: 30px;
+ padding: 5px 5px 5px 16px;
+ }
+
+ .tick {
+ height: 30px;
+ border-top: 1px solid darken(@table-bg-accent, 2%);
+ }
+
.tick.hour {
border-top: 2px solid @table-border-color;
font-size: 0.9em;
padding-left: 5px;
}
-
+
.tick.day {
border-top: 2px solid @brand-primary;
font-size: 0.9em;
padding-left: 5px;
}
- }
-
- .lane.time {
- border-right: 1px solid @table-border-color;
- flex-grow: 0;
- min-width: 50px;
- width: 50px;
- flex-shrink: 0;
- }
-
- .shift {
- margin: 0 5px 5px 0;
- overflow: hidden;
- }
+ }
+
+ .lane.time {
+ border-right: 1px solid @table-border-color;
+ flex-grow: 0;
+ min-width: 50px;
+ width: 50px;
+ flex-shrink: 0;
+ }
+
+ .shift {
+ margin: 0 5px 5px 0;
+ overflow: hidden;
+ }
}
.space-top {
@@ -119,22 +119,22 @@ body {
@keyframes pulse {
0% {
- transform: rotate(0deg);
+ transform: rotate(0deg);
}
10% {
- transform: rotate(5deg) translateY(-2px);
+ transform: rotate(5deg) translateY(-2px);
}
20% {
- transform: rotate(-5deg);
+ transform: rotate(-5deg);
}
- 30% {
- transform: rotate(5deg) translateY(-2px);;
+ 30% {
+ transform: rotate(5deg) translateY(-2px);;
}
- 40% {
- transform: rotate(-5deg);
+ 40% {
+ transform: rotate(-5deg);
}
- 50% {
- transform: rotate(0deg) translateY(-2px);
+ 50% {
+ transform: rotate(0deg) translateY(-2px);
}
75% {
transform: rotate(0deg) translateY(0px);
@@ -143,22 +143,22 @@ body {
@-webkit-keyframes pulse {
0% {
- transform: rotate(0deg);
+ transform: rotate(0deg);
}
10% {
- transform: rotate(5deg) translateY(-2px);
+ transform: rotate(5deg) translateY(-2px);
}
20% {
- transform: rotate(-5deg);
+ transform: rotate(-5deg);
}
- 30% {
- transform: rotate(5deg) translateY(-2px);
+ 30% {
+ transform: rotate(5deg) translateY(-2px);
}
- 40% {
- transform: rotate(-5deg);
+ 40% {
+ transform: rotate(-5deg);
}
- 50% {
- transform: rotate(0deg) translateY(-2px);
+ 50% {
+ transform: rotate(0deg) translateY(-2px);
}
75% {
transform: rotate(0deg) translateY(0px);
@@ -167,22 +167,22 @@ body {
@-moz-keyframes pulse {
0% {
- transform: rotate(0deg);
+ transform: rotate(0deg);
}
10% {
- transform: rotate(5deg) translateY(-2px);
+ transform: rotate(5deg) translateY(-2px);
}
20% {
- transform: rotate(-5deg);
+ transform: rotate(-5deg);
}
- 30% {
- transform: rotate(5deg) translateY(-2px);
+ 30% {
+ transform: rotate(5deg) translateY(-2px);
}
- 40% {
- transform: rotate(-5deg);
+ 40% {
+ transform: rotate(-5deg);
}
- 50% {
- transform: rotate(0deg) translateY(-2px);
+ 50% {
+ transform: rotate(0deg) translateY(-2px);
}
75% {
transform: rotate(0deg) translateY(0px);
diff --git a/themes/theme1.less b/themes/theme1.less
index 134e79b7..7a893951 100644
--- a/themes/theme1.less
+++ b/themes/theme1.less
@@ -1,4 +1,4 @@
-@import "assets/bootstrap/less/variables";
+@import "../vendor/twbs/bootstrap/less/variables";
/*
The MIT License (MIT)
diff --git a/themes/theme2.less b/themes/theme2.less
index 344e23c6..c4486444 100644
--- a/themes/theme2.less
+++ b/themes/theme2.less
@@ -1,4 +1,4 @@
-@import "assets/bootstrap/less/variables";
+@import "../vendor/twbs/bootstrap/less/variables";
@brand-primary: #758499;
@brand-success: #7b9c41;
diff --git a/themes/theme3.less b/themes/theme3.less
index 7e7e0f69..e6be3637 100644
--- a/themes/theme3.less
+++ b/themes/theme3.less
@@ -1,4 +1,4 @@
-@import "assets/bootstrap/less/variables";
+@import "../vendor/twbs/bootstrap/less/variables";
@brand-primary: #f19224;
@brand-success: #39AB50;
diff --git a/themes/theme4.less b/themes/theme4.less
index 2ad8593d..4234de9c 100644
--- a/themes/theme4.less
+++ b/themes/theme4.less
@@ -1,4 +1,4 @@
-@import "assets/bootstrap/less/variables";
+@import "../vendor/twbs/bootstrap/less/variables";
/*
The MIT License (MIT)