diff --git a/app/styles/app.scss b/app/styles/app.scss index 439c22b4..cc6bbe52 100644 --- a/app/styles/app.scss +++ b/app/styles/app.scss @@ -21,24 +21,19 @@ @import "app/main/annotations"; @import "app/main/list"; @import "app/main/log"; -// @import "app/main/repository"; @import "app/main/sponsors"; -// @import "app/main/summary"; -// @import "app/main/tools"; @import "app/main"; -@import "app/maximize"; +// @import "app/maximize"; @import "app/misc"; @import "app/popup"; @import "app/pro"; @import "app/profile/hooks"; @import "app/profile"; @import "app/requests"; -@import "app/right/lists"; -@import "app/right/sponsors"; -@import "app/right"; +// @import "app/right/lists"; +// @import "app/right/sponsors"; +// @import "app/right"; @import "app/settings"; -// @import "app/stats"; -// @import "app/status"; @import "app/tabs"; @import "app/tipsy"; diff --git a/app/styles/app/layout.sass b/app/styles/app/layout.sass index fae03927..a6127a8c 100644 --- a/app/styles/app/layout.sass +++ b/app/styles/app/layout.sass @@ -41,34 +41,10 @@ .wrapper overflow: hidden #main, - #left, - #right + #left margin-bottom: -99999px padding-bottom: 100034px -@media #{$medium-up} - - // layout magic http://lea.verou.me/2011/01/styling-children-based-on-their-number-with-css3/ - .wrapper-main - overflow: hidden - & > div:first-child:nth-last-child(2) - width: grid-calc(20, 24) - float: left - - & > div:first-child:nth-last-child(2) ~ div - width: grid-calc(4, 24) - max-width: 180px - float: right - - .maximized - .wrapper-main - & > div:first-child:nth-last-child(2) - width: grid-calc(24, 24) - float: none - - & > div:first-child:nth-last-child(2) ~ div - display: none - @media #{$large-up} #left, #right, .wrapper-main diff --git a/app/styles/app/main/repository.sass b/app/styles/app/main/repository.sass deleted file mode 100644 index d6e9fc42..00000000 --- a/app/styles/app/main/repository.sass +++ /dev/null @@ -1,94 +0,0 @@ - -// #repo -// position: relative -// width: 100% -// overflow-x: hidden -// padding: 1px 0 0 10px - -// h3 -// margin-right: 5px - -// .status-image -// display: inline-block -// position: relative -// width: 90px -// height: 25px -// vertical-align: top - -// a#status-image-popup -// display: inline-block -// opacity: 1.0 -// img -// border: none - -// .github-icon -// width: 21px -// height: 21px -// display: inline-block -// position: relative -// vertical-align: top -// img -// opacity: 0.65 - -// .not-found -// display: block -// padding: 10px 5px -// font-size: 12px - -// .description, .language -// font-weight: normal -// font-size: 15px - -// .description -// margin: 10px 0 35px 0 -// color: #9ca0a7 - -// .language -// display: none -// padding-right: 5px -// color: #666a72 - -// .github-stats -// position: absolute -// top: 15px -// right: 10px -// > * -// float: left -// a -// height: 16px -// display: block -// font-size: $font-size-smaller -// font-weight: bold -// text-decoration: none -// margin-left: 10px -// padding-left: 20px -// background: no-repeat 0px 2px -// color: $color-text-light -// &.watchers -// background-image: inline-image('ui/github-watchers.png') -// &.forks -// background-image: inline-image('ui/github-forks.png') - -// .tab dd -// a[href^="https://github.com"], -// a[href^="http://github.com"], -// a[href^="https://www.github.com"], -// a[href^="http://www.github.com"] -// &:hover -// background: transparent url(/images/icons/github.png) center right no-repeat -// background-size: 12px -// opacity: 1 -// padding-right: 16px - - -// @media #{$large-up} -// h3 -// display: inline-block -// .github-icon -// display: inline-block -// top: 17px -// margin-right: 1em -// .status-image -// top: 18px - - diff --git a/app/styles/app/main/summary.sass b/app/styles/app/main/summary.sass deleted file mode 100644 index 2aad741e..00000000 --- a/app/styles/app/main/summary.sass +++ /dev/null @@ -1,241 +0,0 @@ - -.green .build-status - background: - color: #549e54 - image: inline-image('icons/state-passed-white.svg') - -.yellow .build-status - background: - color: #bcaf39 - image: inline-image('icons/state-pending-white.svg') - -.red .build-status - background: - color: #b54223 - image: inline-image('icons/state-failed-white.svg') - -.gray .build-status - background: - color: #a8a8a9 - image: inline-image('icons/state-errored-white.svg') - -.build-status - background-size: 14px 14px - background-position: 12px 12px - background-repeat: no-repeat - -#new-summary - @include clearfix - border-radius: 4px - padding: 0 11px 0 51px - position: relative - min-height: 155px - - background: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAADUlEQVR42mN4/+HDfwAJcAPPMJixRQAAAABJRU5ErkJggg=='), #fafafa - background-size: 41px 100% - background-repeat: no-repeat - - @media #{$large-up} - padding-right: 240px - - .mainline - display: -webkit-flex - display: flex - width: 100% - -webkit-flex-wrap: wrap - flex-wrap: wrap - margin: 0 auto - -webkit-align-items: flex-start - align-items: flex-start - - .request-kind - opacity: 0.55 - position: absolute - top: 15px - left: 11px - background-size: contain - background-repeat: no-repeat - height: 21px - width: 21px - - &.push - background-image: inline-image('icons/push.svg') - - &.pull_request - background-image: inline-image('icons/pull-request.svg') - - .branch - margin-right: 5px - font-weight: bold - color: #6c878e - font-size: 16px - max-width: 300px - margin-top: 10px - overflow: hidden - white-space: nowrap - - .subject - font-size: 15px - color: #6c878e - margin-top: 12px - overflow: hidden - margin-right: 2px - line-height: 20px - word-wrap: break-word - padding-left: 0.55em - text-indent: -0.55em - - .body - display: block - font-size: 12px - font-family: Monaco, 'Liberation Mono', Courier, monospace - margin-bottom: 3.5em - margin-top: 17px - overflow: hidden - word-break: break-word - white-space: pre-wrap - - a - text-decoration: underline - - .build-status - border-radius: 4px - color: white - padding: 8px 0 - font-size: 16px - text-align: left - padding-left: 10px - - a - color: white - padding-left: 21px - - .runtime - background-image: inline-image('icons/run-time.svg') - - .finished - background-image: inline-image('icons/finished.svg') - - .tags - background-image: inline-image('icons/tags.svg') - - .commit-changes - background-image: inline-image('icons/github.svg') - - .runtime - margin-top: 5px - - .runtime, .finished, .tags, .commit-changes - background-position: left center - background-repeat: no-repeat - background-size: 14px 14px - padding-left: 20px - font-size: 13px - display: block - width: 100% - height: 24px - text-align: left - line-height: 24px - margin-left: 12px - - .commit-changes - div - display: inline - clear: none - height: 24px - - a - text-overflow: ellipsis - white-space: nowrap - overflow: hidden - display: inline-block - max-width: 175px - line-height: 24px - color: $color-link - - .right - font-size: 11px - - color: $color-link - a:hover - text-decoration: underline - - @media #{$large-up} - position: absolute - top: 10px - right: 10px - width: 220px - - .footer - a - color: #818181 - text-decoration: underline - - img - vertical-align: middle - border-radius: 100px - - .text - line-height: 15px - display: inline-block - position: relative - top: 2px - font-size: $font-size-small - - .author - float: left - margin-top: 10px - position: absolute - bottom: 9px - left: 48px - - div - display: inline - clear: none - color: #818181 - - img - height: 16px - width: 16px - margin-right: 4px - margin-left: 2px - -#summary - margin: 0 0 0 12px - @include clearfix - - .left, - .right - float: left - - a - text-decoration: underline - - dt, dd - float: left - min-height: 25px - margin: 0 - dt - clear: left - width: 90px - dd - width: 150px - white-space: nowrap - > dd - width: 80% - min-width: 315px - overflow: hidden - text-overflow: ellipsis - white-space: nowrap - - .message - white-space: normal - min-width: 0 - - pre - font-size: 12px - display: inline-block - width: 100% - line-height: 18px - margin-bottom: 0 - font-family: Monaco, 'Liberation Mono', Courier, monospace diff --git a/app/styles/app/main/tools.sass b/app/styles/app/main/tools.sass deleted file mode 100644 index 3d7183c5..00000000 --- a/app/styles/app/main/tools.sass +++ /dev/null @@ -1,138 +0,0 @@ - -#tools - position: relative - margin-top: 5px - - & > a.menu-popup-button - display: inline-block - text-align: left - color: #fff - font-size: 13px - padding: 3px 24px 3px 25px - background-image: inline-image('icons/settings.svg'), inline-image('icons/dropdown-arrow-white.svg') - background-size: 14px 14px, 8px 8px - background-position: 6px 7px, right 9px center - background-color: #a6adad - background-repeat: no-repeat - border-radius: 4px - cursor: pointer - img - width: 7px - padding-left: 10px - - .menu - @include resetul - @include border-bottom-radius(4px) - margin-top: 1px - z-index: 1000 - display: none - position: absolute - width: 140px - background-color: #a6adad - a - display: block - color: $white - font-size: $font-size-small - padding: 5px 25px 5px 25px - &:hover:not(.disabled) - background-color: #909393 - &:last-child - @include border-bottom-radius(4px) - &.disabled - cursor: default - color: $color-link-disabled - - @media screen and (min-width: 46em) - position: relative - top: 2px - width: 600px - float: right - & > a.menu-popup-button - margin-top: -37px - float: right - .menu - right: 0 - top: -8px - margin-top: 0 - -#code-climate - a - text-decoration: underline - font-weight: bold - - img - &#code-climate-logo - float: right - width: 150px - margin-top: 5px - margin-right: 10px - -#actions - text-align: right - - ul - @include resetul - li - display: inline - - @media #{$medium-up} - float: right - position: relative - top: 1.8em - ul - margin-top: -21px - - li.restart-build a, li.restart-job a - background-image: inline-image('icons/repeat.svg') - - li.cancel-build a, li.cancel-job a - background-image: inline-image('icons/off.svg') - - li.code-climate a - background-image: inline-image('icons/code-climate-icon.svg') - - li.icon - span.loading - background: inline-image('ui/round-spinner.svg') no-repeat - background-size: 17px 17px - display: inline-block - height: 28px - width: 28px - position: relative - top: -7px - cursor: pointer - color: #ffffff - background-color: #5e869a - text-align: center - border-radius: 50% - background-position: center center - - a - text-indent: -9999px - display: inline-block - width: 28px - height: 28px - position: relative - top: -7px - cursor: pointer - color: #fef4e9 - border-radius: 50% - background-color: #5e869a - background-size: 16px 16px - background-position: center center - background-repeat: no-repeat - text-align: center - - img - width: 16px - height: 16px - margin-top: 6px - margin-left: 0px - - &:hover - opacity: 1.0 - - &.disabled - opacity: 0.6 - display: none - visibility: hidden diff --git a/app/styles/app/stats.sass b/app/styles/app/stats.sass deleted file mode 100644 index aecdcf56..00000000 --- a/app/styles/app/stats.sass +++ /dev/null @@ -1,7 +0,0 @@ - -#repo_count_container, -#build_count_container - width: 100% - height: 300px - margin: 30px 0 - diff --git a/app/styles/app/status.sass b/app/styles/app/status.sass deleted file mode 100644 index 2ddd2618..00000000 --- a/app/styles/app/status.sass +++ /dev/null @@ -1,97 +0,0 @@ - -.status - display: inline-block - width: 10px - height: 10px - margin-right: 2px - background-size: auto auto - background-position: 0px 0px - -.list .status - margin-left: 7px - -#repos .yellow, -.yellow #summary .number, -.list .yellow .number - .status - background-image: inline-image('icons/state-pending.svg') - a - color: $color-text-status-pending - -#repos .green, -.green #summary .number, -.list .green .number, -#requests .accepted .request-id - .status - background-image: inline-image('icons/state-passed.svg') - a - color: $color-text-status-passed - -#repos .red, -.red #summary .number, -.list .red .number, -#requests .rejected .request-id - .status - background-image: inline-image('icons/state-failed.svg') - a - color: $color-text-status-failed - -#repos .gray, -.gray #summary .number, -.list .gray .number - .status - background-image: inline-image('icons/state-errored.svg') - a - color: $color-text-status-gray - -table.list - tbody - td - background-color: $color-bg-job - tr:hover td - background-color: $color-bg-job-highlight - - .green, .accepted - td - background-color: $color-bg-job-passed - &:hover td - background-color: $color-bg-job-passed-highlight - .number a, .request-id a - color: $color-text-status-passed - - .red, .rejected - td - background-color: $color-bg-job-failed - &:hover td - background-color: $color-bg-job-failed-highlight - .number a, .request-id a - color: $color-text-status-failed - - .gray - td - background-color: $color-bg-job-gray - &:hover td - background-color: $color-bg-job-gray-highlight - .number a - color: $color-text-status-gray - - .number a - display: inline-block - text-decoration: none - &:hover - text-decoration: underline - -#workers - .status - background-color: $color-bg-status-waiting - - .waiting .status - background-color: $color-bg-status-waiting - - .errored .status - background-color: $color-bg-status-errored - - .stopped .status - background-color: $color-bg-status-stopped - - diff --git a/app/styles/app/tabs.sass b/app/styles/app/tabs.sass index a8860474..37d04e95 100644 --- a/app/styles/app/tabs.sass +++ b/app/styles/app/tabs.sass @@ -96,26 +96,6 @@ @media #{$medium-up} display: inline-block - // .tab - // margin-top: 15px - // ul.navigation - // @include resetul - // border-bottom: 1px solid #EAEAEA - // li - // margin-right: 10px - // a - // color: #ACACAC - // font-weight: 600 - // font-size: 14px - // a.active - // color: #55888E - // @media #{$small-up} - // li - // display: inline-block - // @media #{$medium-up} - // height: 40px - // line-height: 40px - #builds a display: inline @@ -136,24 +116,17 @@ .tab margin: 30px 0 0 12px -#right - .tabs - margin-left: -3px +// #right +// .tabs +// margin-left: -3px - .active - background-color: $color-bg-right - border-bottom-color: $color-bg-right - h5 - font-weight: bold +// .active +// background-color: $color-bg-right +// border-bottom-color: $color-bg-right +// h5 +// font-weight: bold -@media handheld, only screen and (max-device-width: 980px) - #main - // .tabs - // margin-top: 5px - // li - // margin-right: 0px - // h5 - // min-width: 0px - - #tab_branches - display: none +// @media handheld, only screen and (max-device-width: 980px) +// #main +// #tab_branches +// display: none diff --git a/app/templates/application.hbs b/app/templates/application.hbs index 54b490eb..c24cd689 100644 --- a/app/templates/application.hbs +++ b/app/templates/application.hbs @@ -1,8 +1 @@ {{outlet}} - - -{{#if config.pro}} -
-
  -
-{{/if}}