diff options
author | Marcia Ramos <virtua.creative@gmail.com> | 2018-04-04 18:01:26 +0300 |
---|---|---|
committer | Marcia Ramos <virtua.creative@gmail.com> | 2018-04-04 18:01:26 +0300 |
commit | abbafef38451c233df92d83e57b4cf46ce677a36 (patch) | |
tree | 64f82021e664cc312891b6121da43cf62468c38f | |
parent | 1469cf5f1c68bc1d2a90d4f94400b8f7243f6d94 (diff) | |
parent | 5da71070cfacf92212cd204c67c4c20015cc643d (diff) |
Merge branch 'copy-button-scroll-x' into 'master'
Code block, copy button: fix scroll-x
Closes #187
See merge request gitlab-com/gitlab-docs!238
-rw-r--r-- | content/assets/stylesheets/highlight.scss | 8 | ||||
-rw-r--r-- | content/assets/stylesheets/stylesheet.scss | 9 |
2 files changed, 8 insertions, 9 deletions
diff --git a/content/assets/stylesheets/highlight.scss b/content/assets/stylesheets/highlight.scss index ad7deb9a..dd15866f 100644 --- a/content/assets/stylesheets/highlight.scss +++ b/content/assets/stylesheets/highlight.scss @@ -4,7 +4,7 @@ version: 6 /* https://github.com/idleberg/base16-pygments/blob/master/css/base16-ocean.dark.css */ pre.highlight { - padding: 10px 15px; + padding: 0; border: 1px solid rgba(0, 0, 0, 0.15); box-shadow: 0 1px 0 0 rgba(0, 0, 0, 0.15); border-radius: 3px; @@ -15,11 +15,11 @@ pre.highlight { // Code itself code { + padding: 13px 33px 13px 15px; // 33px: the width of the .clip-btn display: block; - border-color: transparent; color: inherit; - background-color: transparent; - overflow-x: scroll; + overflow-x: auto; + background: transparent; } .hll { background-color: #4f5b66 } diff --git a/content/assets/stylesheets/stylesheet.scss b/content/assets/stylesheets/stylesheet.scss index 395c180f..7ad029b8 100644 --- a/content/assets/stylesheets/stylesheet.scss +++ b/content/assets/stylesheets/stylesheet.scss @@ -93,10 +93,11 @@ pre { .clip-btn { display: inline-block; - padding: 5px; + padding: 10px; padding-left: 10px; - right: 5px; - top: 5px; + padding-top: 13px; + right: 0; + top: 0; cursor: pointer; position: absolute; color: $white; @@ -116,8 +117,6 @@ pre { &:hover { .clip-btn { - background-color: $pre-code-color; - i { opacity: 1; } |