aboutsummaryrefslogtreecommitdiffstats
path: root/src/styles
diff options
context:
space:
mode:
authorLibravatar haraldox <hnaumann+github@gmail.com>2018-01-30 12:41:42 +0100
committerLibravatar haraldox <hnaumann+github@gmail.com>2018-01-30 12:41:42 +0100
commit25446bbdf8d0020b1adfe34e4f45c1a1eec6528e (patch)
treece1716855f3501da31ec2994e6d9ddb3d7e3fa09 /src/styles
parentMerge branch 'develop' into feature/invite-button (diff)
downloadferdium-app-25446bbdf8d0020b1adfe34e4f45c1a1eec6528e.tar.gz
ferdium-app-25446bbdf8d0020b1adfe34e4f45c1a1eec6528e.tar.zst
ferdium-app-25446bbdf8d0020b1adfe34e4f45c1a1eec6528e.zip
Merge branch 'fix-invite-screen' into feature/invite-button
fix linitng errors
Diffstat (limited to 'src/styles')
-rw-r--r--src/styles/invite.scss4
-rw-r--r--src/styles/main.scss1
2 files changed, 0 insertions, 5 deletions
diff --git a/src/styles/invite.scss b/src/styles/invite.scss
deleted file mode 100644
index 345095da8..000000000
--- a/src/styles/invite.scss
+++ /dev/null
@@ -1,4 +0,0 @@
1.invite-form__error {
2 text-align: center;
3 margin-bottom: 20px !important; /* otherwise overridden by rule: p:last-of-type */
4}
diff --git a/src/styles/main.scss b/src/styles/main.scss
index 20f1803e4..261396f6f 100644
--- a/src/styles/main.scss
+++ b/src/styles/main.scss
@@ -18,7 +18,6 @@ $mdi-font-path: '../node_modules/mdi/fonts';
18@import './type.scss'; 18@import './type.scss';
19@import './welcome.scss'; 19@import './welcome.scss';
20@import './auth.scss'; 20@import './auth.scss';
21@import './invite.scss';
22@import './tooltip.scss'; 21@import './tooltip.scss';
23@import './info-bar.scss'; 22@import './info-bar.scss';
24@import './status-bar-target-url.scss'; 23@import './status-bar-target-url.scss';