diff options
| author | Phil Hughes <me@iamphill.com> | 2017-08-10 10:25:44 +0000 |
|---|---|---|
| committer | Jose Ivan Vargas <jvargas@gitlab.com> | 2017-08-11 10:20:17 -0500 |
| commit | 4c4181df94ec55a3650e9bc0c4d1ea90548ac543 (patch) | |
| tree | 8c3fd181000b7077c680cbe4c8f7e2275bf9226d | |
| parent | 67a4fc48aa69261aff9d96472a7f0d2a65c4b96e (diff) | |
| download | gitlab-ce-4c4181df94ec55a3650e9bc0c4d1ea90548ac543.tar.gz | |
Merge branch '36185-or-separator' into 'master'
Aligns OR separater to center properly
Closes #36185
See merge request !13446
| -rw-r--r-- | app/assets/stylesheets/pages/projects.scss | 10 | ||||
| -rw-r--r-- | changelogs/unreleased/36185-or-separator.yml | 4 |
2 files changed, 9 insertions, 5 deletions
diff --git a/app/assets/stylesheets/pages/projects.scss b/app/assets/stylesheets/pages/projects.scss index 276465488e7..d01326637ea 100644 --- a/app/assets/stylesheets/pages/projects.scss +++ b/app/assets/stylesheets/pages/projects.scss @@ -566,14 +566,14 @@ a.deploy-project-label { &::before { content: "OR"; position: absolute; - left: 0; - top: 40%; + left: -10px; + top: 50%; z-index: 10; padding: 8px 0; text-align: center; background-color: $white-light; color: $gl-text-color-tertiary; - transform: translateX(-50%); + transform: translateY(-50%); font-size: 12px; font-weight: bold; line-height: 20px; @@ -581,8 +581,8 @@ a.deploy-project-label { // Mobile @media (max-width: $screen-xs-max) { left: 50%; - top: 10px; - transform: translateY(-50%); + top: 0; + transform: translateX(-50%); padding: 0 8px; } } diff --git a/changelogs/unreleased/36185-or-separator.yml b/changelogs/unreleased/36185-or-separator.yml new file mode 100644 index 00000000000..4e46e60ea1b --- /dev/null +++ b/changelogs/unreleased/36185-or-separator.yml @@ -0,0 +1,4 @@ +--- +title: Align OR separator to center in new project page +merge_request: +author: |