diff options
author | Jacob Schatz <jschatz@gitlab.com> | 2016-06-21 18:27:58 +0300 |
---|---|---|
committer | Robert Speicher <rspeicher@gmail.com> | 2016-06-21 19:07:30 +0300 |
commit | f86308c1dc45ab57583c657f925a03aa761bbb63 (patch) | |
tree | 4e694f63b3f9ea6f1138cbf2c7a6cc7eb1e7d82e /app/assets | |
parent | 1829af43d6ac4f52f65e3fa582cc87cd7e0ef6cd (diff) |
Merge branch 'blank-state' into 'master'
Updated blank state for environments and deployments
## What does this MR do?
Adds a designed blank state to environments and deployments.
@markpundsack do we want to hide the new environments when empty? Looks weird otherwise with the green button at the top.
## What are the relevant issue numbers?
Closes #18661
## Screenshots (if relevant)
![Screen_Shot_2016-06-21_at_09.55.03](/uploads/cf768aba3fd85a596d24b7be4fe6a6c0/Screen_Shot_2016-06-21_at_09.55.03.png)
![Screen_Shot_2016-06-21_at_09.55.10](/uploads/b7b7dba90b613cfa867b084661b36b06/Screen_Shot_2016-06-21_at_09.55.10.png)
See merge request !4818
Diffstat (limited to 'app/assets')
-rw-r--r-- | app/assets/stylesheets/framework.scss | 1 | ||||
-rw-r--r-- | app/assets/stylesheets/framework/blank.scss | 23 |
2 files changed, 24 insertions, 0 deletions
diff --git a/app/assets/stylesheets/framework.scss b/app/assets/stylesheets/framework.scss index 3cbddc59f11..a306b8f3f29 100644 --- a/app/assets/stylesheets/framework.scss +++ b/app/assets/stylesheets/framework.scss @@ -37,3 +37,4 @@ @import "framework/timeline.scss"; @import "framework/typography.scss"; @import "framework/zen.scss"; +@import "framework/blank"; diff --git a/app/assets/stylesheets/framework/blank.scss b/app/assets/stylesheets/framework/blank.scss new file mode 100644 index 00000000000..40b5171a8c6 --- /dev/null +++ b/app/assets/stylesheets/framework/blank.scss @@ -0,0 +1,23 @@ +.blank-state { + padding-top: 20px; + padding-bottom: 20px; + text-align: center; +} + +.blank-state-no-icon { + padding-top: 40px; + padding-bottom: 40px; +} + +.blank-state-title { + margin-top: 0; + margin-bottom: 5px; + font-size: 19px; + font-weight: normal; +} + +.blank-state-text { + margin-top: 0; + margin-bottom: $gl-padding; + font-size: 15px; +} |