summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJose Ivan Vargas Lopez <jvargas@gitlab.com>2016-11-28 15:42:38 -0600
committerJosé Iván Vargas López <jvargas@gitlab.com>2016-12-13 17:29:41 -0600
commit4d37b24614413e4f3e31d08296753fd07ec4bcad (patch)
tree9b7a33a6fe6352a28684adf677b8a26f5b974a54
parentfd2a429f35f521c7ab3b2b868d0e7ad55b6cbbba (diff)
downloadgitlab-ce-4d37b24614413e4f3e31d08296753fd07ec4bcad.tar.gz
Fixed file template dropdown for the "New File" editor for smaller/zoomed screens
-rw-r--r--app/assets/stylesheets/pages/editor.scss51
-rw-r--r--changelogs/unreleased/file-template-dropwdown-proper-position.yml4
2 files changed, 54 insertions, 1 deletions
diff --git a/app/assets/stylesheets/pages/editor.scss b/app/assets/stylesheets/pages/editor.scss
index 778126bcfb7..935f157b33d 100644
--- a/app/assets/stylesheets/pages/editor.scss
+++ b/app/assets/stylesheets/pages/editor.scss
@@ -51,8 +51,16 @@
.new-file-name {
display: inline-block;
- width: 450px;
+ max-width: 450px;
float: left;
+
+ @media(max-width: $screen-md-max) {
+ width: 280px;
+ }
+
+ @media(max-width: $screen-sm-max) {
+ width: 180px;
+ }
}
.file-buttons {
@@ -114,3 +122,44 @@
}
}
}
+
+@media(max-width: $screen-xs-max){
+ .file-editor {
+ .file-title {
+ .pull-right {
+ height: auto;
+ }
+ }
+
+ .new-file-name {
+ margin-bottom: 0;
+ max-width: none;
+ width: 100%;
+ }
+
+ .file-buttons {
+ display: flex;
+ flex-direction: column;
+ width: 100%;
+ margin-bottom: 7px;
+
+ .soft-wrap-toggle {
+ margin: 7px 0 0;
+ }
+
+ .encoding-selector,
+ .license-selector,
+ .gitignore-selector,
+ .gitlab-ci-yml-selector {
+ margin: 7px 0 0;
+
+ button {
+ width: 100%;
+ }
+ }
+
+ }
+
+ }
+
+}
diff --git a/changelogs/unreleased/file-template-dropwdown-proper-position.yml b/changelogs/unreleased/file-template-dropwdown-proper-position.yml
new file mode 100644
index 00000000000..cf2a622b7e6
--- /dev/null
+++ b/changelogs/unreleased/file-template-dropwdown-proper-position.yml
@@ -0,0 +1,4 @@
+---
+title: Fixed file template dropdown for the "New File" editor for smaller/zoomed screens
+merge_request:
+author: