diff options
Diffstat (limited to 'app/assets')
-rw-r--r-- | app/assets/javascripts/project_new.js | 13 | ||||
-rw-r--r-- | app/assets/stylesheets/framework/dropdowns.scss | 8 | ||||
-rw-r--r-- | app/assets/stylesheets/framework/selects.scss | 6 | ||||
-rw-r--r-- | app/assets/stylesheets/pages/editor.scss | 4 | ||||
-rw-r--r-- | app/assets/stylesheets/pages/icons.scss | 12 |
5 files changed, 34 insertions, 9 deletions
diff --git a/app/assets/javascripts/project_new.js b/app/assets/javascripts/project_new.js index 40575caa57f..0d3fb31a9cf 100644 --- a/app/assets/javascripts/project_new.js +++ b/app/assets/javascripts/project_new.js @@ -45,7 +45,9 @@ }; ProjectNew.prototype.toggleRepoVisibility = function () { - var $repoAccessLevel = $('.js-repo-access-level select'); + var $repoAccessLevel = $('.js-repo-access-level select'), + containerRegistry = document.querySelectorAll('.js-container-registry')[0], + containerRegistryCheckbox = document.getElementById('project_container_registry_enabled'); this.$repoSelects.find("option[value='" + $repoAccessLevel.val() + "']") .nextAll() @@ -70,8 +72,17 @@ if (selectedVal) { this.$repoSelects.removeClass('disabled'); + + if (containerRegistry) { + containerRegistry.style.display = ''; + } } else { this.$repoSelects.addClass('disabled'); + + if (containerRegistry) { + containerRegistry.style.display = 'none'; + containerRegistryCheckbox.checked = false; + } } }.bind(this)); }; diff --git a/app/assets/stylesheets/framework/dropdowns.scss b/app/assets/stylesheets/framework/dropdowns.scss index baa38ab60c8..3e34ec98427 100644 --- a/app/assets/stylesheets/framework/dropdowns.scss +++ b/app/assets/stylesheets/framework/dropdowns.scss @@ -36,7 +36,7 @@ color: $dropdown-toggle-color; font-size: 15px; text-align: left; - border: 1px solid $dropdown-toggle-border-color; + border: 1px solid $border-color; border-radius: $border-radius-base; outline: 0; text-overflow: ellipsis; @@ -45,11 +45,9 @@ .fa { position: absolute; - top: 50%; - right: 6px; - margin-top: -6px; + top: 10px; + right: 8px; color: $dropdown-toggle-icon-color; - font-size: 10px; &.fa-spinner { font-size: 16px; diff --git a/app/assets/stylesheets/framework/selects.scss b/app/assets/stylesheets/framework/selects.scss index ecdf0be1a05..13749f1b7bd 100644 --- a/app/assets/stylesheets/framework/selects.scss +++ b/app/assets/stylesheets/framework/selects.scss @@ -27,9 +27,9 @@ height: 0; margin-left: 2px; vertical-align: middle; - border-top: $caret-width-base dashed; - border-right: $caret-width-base solid transparent; - border-left: $caret-width-base solid transparent; + border-top: 5px dashed; + border-right: 5px solid transparent; + border-left: 5px solid transparent; color: $gray-darkest; } } diff --git a/app/assets/stylesheets/pages/editor.scss b/app/assets/stylesheets/pages/editor.scss index cb8cefaca97..778126bcfb7 100644 --- a/app/assets/stylesheets/pages/editor.scss +++ b/app/assets/stylesheets/pages/editor.scss @@ -55,6 +55,10 @@ float: left; } + .file-buttons { + font-size: 0; + } + .select2 { float: right; } diff --git a/app/assets/stylesheets/pages/icons.scss b/app/assets/stylesheets/pages/icons.scss new file mode 100644 index 00000000000..407c8db211d --- /dev/null +++ b/app/assets/stylesheets/pages/icons.scss @@ -0,0 +1,12 @@ +// CI icon colors + +.ci-status-icon { + &-created { + fill: $gray-darkest; + } + + &-skipped, + &-canceled { + fill: $gl-text-color; + } +} |