diff --git a/src/themes/scss/theme/components/button/index.scss b/src/themes/scss/theme/components/button/index.scss index ed89f6d..7df6c4f 100644 --- a/src/themes/scss/theme/components/button/index.scss +++ b/src/themes/scss/theme/components/button/index.scss @@ -122,7 +122,10 @@ &.primary, &.red, &.basic { font-weight: 500; } - } - + &.green { + color: var(--color-white); + background: var(--color-green-dark-2); + } + } } \ No newline at end of file diff --git a/src/themes/scss/theme/components/forms/_input.scss b/src/themes/scss/theme/components/forms/_input.scss index d5c93d8..bb6eb88 100644 --- a/src/themes/scss/theme/components/forms/_input.scss +++ b/src/themes/scss/theme/components/forms/_input.scss @@ -30,7 +30,6 @@ color: var(--color-input-text); border-radius: var(--border-radius); line-height: 20px; - min-height: auto; padding: calc(#{var.get('measure/.375x')} - 1px) var.get('measure/.75x'); +.ui.button:last-child { @@ -40,7 +39,6 @@ } @include -all-inputs(':hover') { - // border-radius: var(--border-radius); border-color: var(--color-input-border); color: var(--color-input-text) } @@ -56,6 +54,10 @@ @include -all-inputs('.active') { border-radius: var(--border-radius); outline: 2px solid var(--color-accent); + + > input.search { + outline: none; + } } .ui.action.input:not([class*="left action"])>input:focus { @@ -83,4 +85,43 @@ font-size: var.get('font-size/md'); font-weight: 600; } + + .ui.form textarea, + .ui.form input:not([type]), + .ui.form input[type=date], + .ui.form input[type=datetime-local], + .ui.form input[type=email], + .ui.form input[type=number], + .ui.form input[type=password], + .ui.form input[type=search], + .ui.form input[type=tel], + .ui.form input[type=time], + .ui.form input[type=text], + .ui.form input[type=file], + .ui.form input[type=url] { + min-height: 2.71428571em; + } + + .ui.selection.dropdown { + min-height: 2.71428571em; + >input { + min-height: 0; + &:focus { + outline: none; + } + } + } + + .ui.multiple.dropdown>.label, .ui.multiple.search.dropdown>input.search { + padding: var.get('measure/.375x') var.get('measure/.75x'); + margin: .14285714rem .28571429rem .14285714rem 0; + } + + .ui.multiple.search.dropdown>input.search { + padding-left: 0; + } + + .ui.checkbox label, .ui.radio.checkbox label { + margin-left: 20px !important; + } } \ No newline at end of file diff --git a/src/themes/scss/theme/components/forms/_menu.scss b/src/themes/scss/theme/components/forms/_menu.scss index 6e7b2c2..5d5264a 100644 --- a/src/themes/scss/theme/components/forms/_menu.scss +++ b/src/themes/scss/theme/components/forms/_menu.scss @@ -10,7 +10,7 @@ opacity: 0; overflow-x: hidden; &.hidden { opacity: 0 !important;} - &.visible { opacity: 1 !important; } + &.visible, &.show { opacity: 1 !important; } border-radius: var(--border-radius) !important; transition: opacity .2s ease !important; diff --git a/src/themes/scss/theme/modules/issues/_issue.scss b/src/themes/scss/theme/modules/issues/_issue.scss index cefe9e9..5335929 100644 --- a/src/themes/scss/theme/modules/issues/_issue.scss +++ b/src/themes/scss/theme/modules/issues/_issue.scss @@ -182,10 +182,17 @@ .repository .diff-detail-box { // diff page detail box padding: var.get('measure/.5x') 0; - margin: calc(var.get('measure/1x') * -1) 0 0 0; height: 60px; } + .repository.view.issue .pull.tabs.container { + + div { + >.diff-detail-box:first-child { + margin: calc(var.get('measure/1x') * -1) 0 0 0; + } + } + } + .repository #diff-container { #diff-file-tree { top: 60px; diff --git a/src/themes/scss/theme/modules/repo/_home.scss b/src/themes/scss/theme/modules/repo/_home.scss index 01a8e8c..4fd608c 100644 --- a/src/themes/scss/theme/modules/repo/_home.scss +++ b/src/themes/scss/theme/modules/repo/_home.scss @@ -240,4 +240,8 @@ .tippy-svg-arrow { display: none; } + + .repository.file.editor .commit-form-wrapper .commit-form:before, .repository.file.editor .commit-form-wrapper .commit-form:after { + display: none; + } } diff --git a/src/themes/scss/theme/modules/repo/_secondary-navbar.scss b/src/themes/scss/theme/modules/repo/_secondary-navbar.scss index 6c238da..d3d6042 100644 --- a/src/themes/scss/theme/modules/repo/_secondary-navbar.scss +++ b/src/themes/scss/theme/modules/repo/_secondary-navbar.scss @@ -103,6 +103,11 @@ } } + .fork-flag { + margin-top: calc(#{var.get('measure/1x')} * -1) !important; + margin-bottom: var.get('measure/1x') !important; + } + // header navbar menu overflow-menu.ui.secondary.pointing.menu { .overflow-menu-items {