Merge pull request #23 from camalot/develop

- removed the version string from the bottom right (i didn't like it) - fixed the spinning gear, on main dashboard. It didn't look right when spinning - fixed the styling on some non-built jobs on the dashboard
camalot · May 28, 2016 · ebd50a4 · ebd50a4
2 parents b2636d1 + 9d4bb20
commit ebd50a4
Show file tree

Hide file tree

Showing 10 changed files with 143 additions and 97 deletions.
diff --git a/.gitignore b/.gitignore
@@ -8,3 +8,6 @@ target/
 work/
 *.iml
 webapp/
+
+jenkins-dark.css
+jenkins-dark.min.css
diff --git a/README.md b/README.md
@@ -78,5 +78,8 @@ This will generate the following:
 - Create a pull request into `develop`
 
 
+
+[unit-tests]: https://github.com/jamesshore/quixote
+
 [stylish-chrome]: https://chrome.google.com/webstore/detail/stylish/fjnbnpbmkenffdnngjfgmeleoegfcffe?hl=en
 [stylish-firefox]: https://addons.mozilla.org/en-US/firefox/addon/stylish/
diff --git a/appveyor.yml b/appveyor.yml
@@ -33,19 +33,19 @@ install:
 - cmd: SET JAVA_OPTS=-XX:MaxPermSize=2g -Xmx4g
 build_script:
 - ps: |
-    $dist = "${env:APPVEYOR_BUILD_FOLDER}\}\dist\";
+    $dist = "$env:APPVEYOR_BUILD_FOLDER\dist\";
     if ( !(Test-Path -Path $dist) ) {
       New-Item -Path $dist -ItemType Directory -Force;
     }
 - cmd: grunt
 - ps: |
-    $webapp = "${env:APPVEYOR_BUILD_FOLDER}\plugin\src\main\webapp";
+    $webapp = "$env:APPVEYOR_BUILD_FOLDER\plugin\src\main\webapp";
     if ( (Test-Path -Path $webapp) ) {
       Remove-Item -Path $webapp | Out-Null;
     }
     New-Item -Path $webapp -ItemType Directory -Force | Out-Null;
-    Copy-Item -Path ${env:APPVEYOR_BUILD_FOLDER}\dist\*.min.css -Destination ${env:APPVEYOR_BUILD_FOLDER}\plugin\src\main\webapp\
-    Compress-Archive -Path "${env:APPVEYOR_BUILD_FOLDER}/dist/*.css" -DestinationPath "${env:APPVEYOR_BUILD_FOLDER}/dist/${env:APPVEYOR_PROJECT_NAME}-${env:APPVEYOR_BUILD_VERSION}.zip"
+    Copy-Item -Path $dist\*.min.css -Destination $webapp -Force
+    Compress-Archive -Path "$dist\*.css" -DestinationPath "$dist\${env:APPVEYOR_PROJECT_NAME}-${env:APPVEYOR_BUILD_VERSION}.zip"
     $plugin = "${env:APPVEYOR_BUILD_FOLDER}\plugin\";
     $target = Join-Path -Path $plugin -ChildPath target;
     if ( (Test-Path -Path $target) ) {
@@ -57,6 +57,7 @@ build_script:
     "Sleeping..." | Write-Host;
     Start-Sleep -s 15;
     "Time to wake up..." | Write-Host;
+    "Copy hpi to /dist folder" | Write-Host;
     Copy-Item -Path "$target\jenkins-dark-theme.hpi" -Destination "${env:APPVEYOR_BUILD_FOLDER}\dist\${env:APPVEYOR_PROJECT_NAME}-${env:APPVEYOR_BUILD_VERSION}.hpi"
 artifacts:
 - path: dist/jenkins-dark.css
@@ -76,14 +77,36 @@ deploy:
     secure: Es5XTlIJiCiCFJHGDOA09AGFVZQL0jIWtUuPp4+m7MBcfeoVGbWQP2jYU3oSL5bw
   artifact: zip, hpi
   draft: false
+  prerelease: false
   force_update: true
   on:
     branch: master
+- provider: GitHub
+  tag: $(APPVEYOR_PROJECT_NAME)-$(APPVEYOR_BUILD_VERSION)-prerelease
+  release: $(APPVEYOR_PROJECT_NAME)-$(APPVEYOR_BUILD_VERSION)-prerelease
+  auth_token:
+    secure: Es5XTlIJiCiCFJHGDOA09AGFVZQL0jIWtUuPp4+m7MBcfeoVGbWQP2jYU3oSL5bw
+  artifact: zip, hpi
+  prerelease: true
+  draft: false
+  force_update: true
+  on:
+    branch: develop
+# - provider: GitHub
+#   tag: $(APPVEYOR_PROJECT_NAME)-$(APPVEYOR_BUILD_VERSION)-snapshot
+#   release: $(APPVEYOR_PROJECT_NAME)-$(APPVEYOR_BUILD_VERSION)-snapshot
+#   auth_token:
+#     secure: Es5XTlIJiCiCFJHGDOA09AGFVZQL0jIWtUuPp4+m7MBcfeoVGbWQP2jYU3oSL5bw
+#   artifact: zip, hpi
+#   draft: true
+#   prerelease: true
+#   force_update: true
+#   on:
+#     branch: /(?!develop|master)/
 after_deploy:
 - ps: |
-    if ( $ENV:APPVEYOR_PULL_REQUEST_NUMBER -eq $null -and $ENV:APPVEYOR_REPO_BRANCH -match 'master$' ) {
-      Set-Location "${env:APPVEYOR_BUILD_FOLDER}";
-      & git reset --hard;
+    try {
+      Set-Location $env:APPVEYOR_BUILD_FOLDER | Out-Null;
       & git config --global credential.helper store;
       Add-Content "$ENV:USERPROFILE\.git-credentials" "https://$($ENV:gh_access_token):x-oauth-basic@github.com`n";
       & git config --global user.email "$ENV:git_email"
@@ -93,10 +116,20 @@ after_deploy:
       if ( !(Test-Path -Path $temp )) {
         New-Item -Path $temp -Force -ItemType Directory | Out-Null;
       }
-      Copy-Item -Path "${env:APPVEYOR_BUILD_FOLDER}\dist\*.css" -Destination $temp;
-      & git checkout gh-pages;
-      Copy-Item -Path "$temp\*.*" -Destination ${env:APPVEYOR_BUILD_FOLDER};
+
+      Copy-Item -Path "${env:APPVEYOR_BUILD_FOLDER}\dist\*.css" -Destination $temp -Force;
+      "Checkout branch gh-pages" | Write-Host;
+      & git checkout --force gh-pages;
+      "Copy temp files to path" | Write-Host;
+      Copy-Item -Path "$temp\*.*" -Destination ${env:APPVEYOR_BUILD_FOLDER} -Force;
+      "Add files ./*.css" | Write-Host;
       & git add ./*.css
       & git commit -m "version $VERSION";
-      & git push origin gh-pages;
+      if ( $ENV:APPVEYOR_PULL_REQUEST_NUMBER -eq $null -and $ENV:APPVEYOR_REPO_BRANCH -match 'master$' ) {
+        # only push for non-pull-requests and on master
+        & git push origin gh-pages;
+      }
+    } catch [Exception]  {
+      "$_.Exception.GetType().FullName, $_.Exception.Message" | Write-Error;
+      throw;
     }
diff --git a/jenkins-dark.less b/jenkins-dark.less
@@ -5,34 +5,12 @@
 * Issues: https://github.com/camalot/jenkins-dark-stylish/issues
 **/
 @import url( './parts/_variables.less');
-.jenkins_ver::after {
-    content: ' : Jenkins-Dark v${VERSION}';
-}
 #l10n-footer {
-    display: none;
+    display: none !important;
 }
 @import url( './parts/_keyframes.less');
-::-webkit-scrollbar {
-    max-width: 10px !important;
-    max-height: 10px !important;
-    background: lighten(@background-light,8.8%) !important;
-}
-::-webkit-scrollbar-corner,
-::-webkit-scrollbar-track {
-    background: lighten(@background-light,8.8%) !important;
-}
-::-webkit-scrollbar-thumb {
-    border-radius: 5px !important;
-    background: rgba(80,80,80,.6) !important;
-}
-::-webkit-scrollbar-corner,
-::-webkit-scrollbar-track {
-    background: lighten(@background-light,8.8%) !important;
-}
-::selection {
-    background-color: lighten(@blue,20%) !important;
-    color: @white !important;
-}
+@import url('./parts/_scrollbar.less');
+
 #main-panel,
 .bottom-sticker-inner,
 .top-sticker-inner,
@@ -99,11 +77,7 @@ footer {
     /* hide the shadow on the bottom panel */
     display: none;
 }
-#menuSelector,
-.healthReportDetails {
-    -webkit-filter: invert(100%);
-}
-.healthReportDetails img {
+#menuSelector {
     -webkit-filter: invert(100%);
 }
 .hetero-list-container .dd-handle,
@@ -141,43 +115,10 @@ footer {
 @import url("./parts/_breadcrumbs.less");
 @import url("./parts/_side-panel.less");
 @import url("./parts/_main-panel.less");
-/* bigtable */
-.bigtable tr {
-    border: 1px solid @background-dark;
-}
 #projectstatus .header {
     border-bottom-color: @background-dark;
 }
-.bigtable th,
-.bigtable tr.header {
-    background-color: @background-black;
-    border-color: @background-dark;
-    color: @text-light;
-}
-table.sortable span.sortarrow {
-    color: @text-light;
-}
-.bigtable tr.header th {
-    background-color: @background-black;
-    color: @text-light;
-}
-table.sortable a.sortheader {
-    color: @text-light;
-}
-table.bigtable.pane > tbody > tr > td:last-child {}
-.pane-frame .bigtable tr,
-.pane-frame table {}
-table.stripped tr:nth-child(even) {
-    background: @background-black;
-    color: @text-light;
-}
-.bigtable .plugin-category td.pane {
-    font-size: 3em;
-    text-align: center;
-    text-transform: uppercase;
-    background-color: #4183C4;
-    color: @text-light;
-}
+@import url('./parts/_table.less');
 @import url( './parts/_dashboard.less');
 @import url( './parts/_buildHistory.less');
 @import url( './parts/_tasks.less');
@@ -192,26 +133,7 @@ table.stripped tr:nth-child(even) {
     vertical-align: middle;
 }
 .setting-name::after {}
-#filter-box,
-#search-box {
-    border: solid 1px @background-black;
-    border-radius: 0;
-    box-shadow: none;
-    background: #3a3a3a @search-image-16 3px center no-repeat !important;
-    padding: 4px 3px 4px 25px !important;
-    color: @text-light;
-}
-#filter-box:hover,
-#search-box:hover {
-    border-color: @blue;
-}
+@import url('./parts/_searchbox.less');
 @import url( './parts/_buttons.less');
 @import url( './parts/_tabs.less');
-/* this is the trend timeline */
-.timeline-container {
-    -webkit-filter: invert(80%);
-}
-/* this is inside the timeline, so we invert it back to normal */
-.timeline-container .timeline-event-icon > img {
-    -webkit-filter: invert(80%);
-}
+@import url( './parts/_timeline.less');
diff --git a/package.json b/package.json
@@ -46,7 +46,9 @@
     "load-grunt-tasks": "^3.3.0",
     "npm": "^3.4.1",
     "pixrem": "^3.0.0",
-    "postcss-encode-base64-inlined-images": "0.0.1"
+    "postcss-encode-base64-inlined-images": "0.0.1",
+
+    "quixote": "^0.12.2"
   },
   "dependencies": {}
 }
diff --git a/parts/_dashboard.less b/parts/_dashboard.less
@@ -18,6 +18,7 @@ table#computers {
     .job-status-green,
     .job-status-blue,
     .job-status-aborted,
+    .job-status-grey,
     .job-status-nobuilt,
     .job-status- {
       td {
@@ -31,6 +32,7 @@ table#computers {
       &.job-status-yellow-anime,
       &.job-status-green-anime,
       &.job-status-blue-anime,
+      &.job-status-grey-anime,
       &.job-status-nobuilt-anime,
       &.job-status-aborted-anime, {
         animation: pulse 5s infinite;
@@ -43,6 +45,7 @@ table#computers {
       &.job-status-yellow-anime,
       &.job-status-green-anime,
       &.job-status-blue-anime,
+      &.job-status-grey-anime,
       &.job-status-nobuilt-anime,
       &.job-status-aborted-anime, {
         animation: pulse-alt 5s infinite;

diff --git a/parts/_scrollbar.less b/parts/_scrollbar.less
@@ -0,0 +1,22 @@
+@import url( './_variables.less');
+::-webkit-scrollbar {
+    max-width: 10px !important;
+    max-height: 10px !important;
+    background: lighten(@background-light,8.8%) !important;
+}
+::-webkit-scrollbar-corner,
+::-webkit-scrollbar-track {
+    background: lighten(@background-light,8.8%) !important;
+}
+::-webkit-scrollbar-thumb {
+    border-radius: 5px !important;
+    background: rgba(80,80,80,.6) !important;
+}
+::-webkit-scrollbar-corner,
+::-webkit-scrollbar-track {
+    background: lighten(@background-light,8.8%) !important;
+}
+::selection {
+    background-color: lighten(@blue,20%) !important;
+    color: @white !important;
+}
diff --git a/parts/_searchbox.less b/parts/_searchbox.less
@@ -0,0 +1,14 @@
+@import url( './_variables.less');
+#filter-box,
+#search-box {
+    border: solid 1px @background-black;
+    border-radius: 0;
+    box-shadow: none;
+    background: #3a3a3a @search-image-16 3px center no-repeat !important;
+    padding: 4px 3px 4px 25px !important;
+    color: @text-light;
+}
+#filter-box:hover,
+#search-box:hover {
+    border-color: @blue;
+}
diff --git a/parts/_table.less b/parts/_table.less
@@ -0,0 +1,35 @@
+@import url( './_variables.less');
+/* bigtable */
+.bigtable tr {
+    border: 1px solid @background-dark;
+}
+.bigtable th,
+.bigtable tr.header {
+    background-color: @background-black;
+    border-color: @background-dark;
+    color: @text-light;
+}
+table.sortable span.sortarrow {
+    color: @text-light;
+}
+.bigtable tr.header th {
+    background-color: @background-black;
+    color: @text-light;
+}
+table.sortable a.sortheader {
+    color: @text-light;
+}
+table.bigtable.pane > tbody > tr > td:last-child {}
+.pane-frame .bigtable tr,
+.pane-frame table {}
+table.stripped tr:nth-child(even) {
+    background: @background-black;
+    color: @text-light;
+}
+.bigtable .plugin-category td.pane {
+    font-size: 3em;
+    text-align: center;
+    text-transform: uppercase;
+    background-color: #4183C4;
+    color: @text-light;
+}
diff --git a/parts/_timeline.less b/parts/_timeline.less
@@ -0,0 +1,9 @@
+@import url( './_variables.less');
+/* this is the trend timeline */
+.timeline-container {
+    -webkit-filter: invert(80%);
+}
+/* this is inside the timeline, so we invert it back to normal */
+.timeline-container .timeline-event-icon > img {
+    -webkit-filter: invert(80%);
+}