diff options
| author | Clement Ho <ClemMakesApps@gmail.com> | 2018-05-16 12:46:52 -0500 |
|---|---|---|
| committer | Clement Ho <ClemMakesApps@gmail.com> | 2018-05-16 12:46:52 -0500 |
| commit | fcae43c604cb903c11a2cf6c27824e47f315831a (patch) | |
| tree | aeefc767a1bdccef5ef77e950c16f5deabac4691 /app/assets/stylesheets/framework | |
| parent | e32aed55b8cf01965558056d86087a31f65ca874 (diff) | |
| parent | 9e41ed61ea70532578416e01c228ff7a81abc192 (diff) | |
| download | gitlab-ce-fcae43c604cb903c11a2cf6c27824e47f315831a.tar.gz | |
Merge branch 'master' into bootstrap4
Diffstat (limited to 'app/assets/stylesheets/framework')
| -rw-r--r-- | app/assets/stylesheets/framework/mixins.scss | 12 | ||||
| -rw-r--r-- | app/assets/stylesheets/framework/snippets.scss | 3 |
2 files changed, 14 insertions, 1 deletions
diff --git a/app/assets/stylesheets/framework/mixins.scss b/app/assets/stylesheets/framework/mixins.scss index 9ff24ebc127..0ea0b65b95f 100644 --- a/app/assets/stylesheets/framework/mixins.scss +++ b/app/assets/stylesheets/framework/mixins.scss @@ -210,3 +210,15 @@ margin-left: -$size; } } + +/* + * Mixin that fixes wrapping issues with long strings (e.g. URLs) + * + * Note: the width needs to be set for it to work in Firefox + */ +@mixin overflow-break-word { + overflow-wrap: break-word; + word-wrap: break-word; + word-break: break-word; + max-width: 100%; +} diff --git a/app/assets/stylesheets/framework/snippets.scss b/app/assets/stylesheets/framework/snippets.scss index bb185d2bd81..f80e9b1014b 100644 --- a/app/assets/stylesheets/framework/snippets.scss +++ b/app/assets/stylesheets/framework/snippets.scss @@ -67,7 +67,8 @@ padding: 8px 40px; } - .embed-toggle { + .embed-toggle, + .snippet-clipboard-btn { height: 35px; } } |