summaryrefslogtreecommitdiff
path: root/app/assets/stylesheets
diff options
context:
space:
mode:
authorAnnabel Dunstone Gray <annabel.dunstone@gmail.com>2017-11-08 16:27:41 -0700
committerAnnabel Dunstone Gray <annabel.dunstone@gmail.com>2017-11-08 17:41:59 -0700
commit95ab3bf5b14213bf1edb19d1e936bb6548836124 (patch)
treef072038055b501b02bfc8174d7dc3ce0575f20ef /app/assets/stylesheets
parent5c909f2b71af760c88d8574328630b8d87479700 (diff)
downloadgitlab-ce-95ab3bf5b14213bf1edb19d1e936bb6548836124.tar.gz
Use flexbox instead of bootstrap columns3615-improve-welcome-screen
Diffstat (limited to 'app/assets/stylesheets')
-rw-r--r--app/assets/stylesheets/framework/blank.scss22
1 files changed, 21 insertions, 1 deletions
diff --git a/app/assets/stylesheets/framework/blank.scss b/app/assets/stylesheets/framework/blank.scss
index 28cece67165..10f9e9b70b0 100644
--- a/app/assets/stylesheets/framework/blank.scss
+++ b/app/assets/stylesheets/framework/blank.scss
@@ -11,6 +11,13 @@
}
}
+.blank-state-row {
+ display: flex;
+ flex-wrap: wrap;
+ justify-content: space-around;
+ height: 100%;
+}
+
.blank-state-welcome {
text-align: center;
padding: 20px 0 40px;
@@ -27,6 +34,20 @@
.blank-state-link {
display: block;
color: $gl-text-color;
+ flex: 0 0 100%;
+ margin-bottom: 15px;
+
+ @media (min-width: $screen-sm-min) {
+ flex: 0 0 49%;
+
+ &:nth-child(odd) {
+ margin-right: 5px;
+ }
+
+ &:nth-child(even) {
+ margin-left: 5px;
+ }
+ }
&:hover {
background-color: $gray-light;
@@ -37,7 +58,6 @@
.blank-state {
padding: 20px;
- margin-bottom: 30px;
border: 1px solid $border-color;
border-radius: $border-radius-default;