summaryrefslogtreecommitdiffstats
path: root/webapp/sass/components
diff options
context:
space:
mode:
Diffstat (limited to 'webapp/sass/components')
-rw-r--r--webapp/sass/components/_dropdown.scss5
-rw-r--r--webapp/sass/components/_modal.scss4
-rw-r--r--webapp/sass/components/_module.scss1
-rw-r--r--webapp/sass/components/_save-button.scss7
-rw-r--r--webapp/sass/components/_scrollbar.scss8
-rw-r--r--webapp/sass/components/_videos.scss20
6 files changed, 43 insertions, 2 deletions
diff --git a/webapp/sass/components/_dropdown.scss b/webapp/sass/components/_dropdown.scss
index 1168c9b27..5ed0bca61 100644
--- a/webapp/sass/components/_dropdown.scss
+++ b/webapp/sass/components/_dropdown.scss
@@ -6,6 +6,11 @@
z-index: 2500;
}
+ .fa {
+ @include opacity(.6);
+ margin-right: 5px;
+ }
+
.divider {
@include opacity(.15);
}
diff --git a/webapp/sass/components/_modal.scss b/webapp/sass/components/_modal.scss
index d53be29dc..3d3a11de0 100644
--- a/webapp/sass/components/_modal.scss
+++ b/webapp/sass/components/_modal.scss
@@ -448,7 +448,7 @@
@include opacity(.8);
float: right;
margin-right: 3px;
- margin-top: 12px;
+ margin-top: 8px;
}
.member-select__container {
@@ -459,7 +459,7 @@
select {
@include opacity(.8);
float: right;
- margin: 5px 5px 0 2px;
+ margin: 1px 5px 0 2px;
width: auto;
}
}
diff --git a/webapp/sass/components/_module.scss b/webapp/sass/components/_module.scss
index 24488df96..e74404d9c 100644
--- a/webapp/sass/components/_module.scss
+++ b/webapp/sass/components/_module.scss
@@ -11,6 +11,7 @@
@import 'modal';
@import 'oauth';
@import 'popover';
+@import 'save-button';
@import 'scrollbar';
@import 'search';
@import 'suggestion-list';
diff --git a/webapp/sass/components/_save-button.scss b/webapp/sass/components/_save-button.scss
new file mode 100644
index 000000000..12f793aa1
--- /dev/null
+++ b/webapp/sass/components/_save-button.scss
@@ -0,0 +1,7 @@
+@charset 'UTF-8';
+
+.save-button {
+ .glyphicon {
+ margin-right: 10px;
+ }
+} \ No newline at end of file
diff --git a/webapp/sass/components/_scrollbar.scss b/webapp/sass/components/_scrollbar.scss
index b6ec4f22f..b868c0bf0 100644
--- a/webapp/sass/components/_scrollbar.scss
+++ b/webapp/sass/components/_scrollbar.scss
@@ -29,3 +29,11 @@ body {
@include border-radius(2px);
@include alpha-property(background-color, $black, .5);
}
+
+.scrollbar--view {
+ -ms-overflow-style: none;
+
+ .browser--ie & {
+ margin: 0 !important;
+ }
+} \ No newline at end of file
diff --git a/webapp/sass/components/_videos.scss b/webapp/sass/components/_videos.scss
index e009e6538..b2230f71d 100644
--- a/webapp/sass/components/_videos.scss
+++ b/webapp/sass/components/_videos.scss
@@ -10,6 +10,22 @@
max-width: 100%;
}
+ .video-thumbnail__error {
+ height: 100%;
+ line-height: 2;
+ padding: 110px 0;
+ text-align: center;
+ width: 100%;
+
+ .fa {
+ @include opacity(.5);
+ }
+
+ div {
+ font-size: 1.2em;
+ }
+ }
+
.block {
background-color: alpha-color($black, .5);
border-radius: 10px;
@@ -67,3 +83,7 @@
height: 500px;
}
}
+
+.video-loading {
+ height: 360px;
+} \ No newline at end of file