diff --git a/static/css/quay.css b/static/css/quay.css index fd8e2f109..ecf162013 100644 --- a/static/css/quay.css +++ b/static/css/quay.css @@ -19,8 +19,7 @@ width: 40px; } -.repo-circle .icon-lock { - font-size: 50%; +.repo-circle .fa-lock { position: absolute; bottom: -6px; right: 0px; @@ -31,11 +30,11 @@ text-align: center; height: 20px; line-height: 21px; - font-size: 12px; + font-size: 16px; } -.repo-circle.no-background .icon-lock { - bottom: -4px; +.repo-circle.no-background .fa-lock { + bottom: 2px; right: -6px; color: #444; } @@ -660,7 +659,7 @@ p.editable:hover i { } .repo-listing i { - font-size: 1.5em; + font-size: 2em; color: #999; display: inline-block; margin-right: 6px; @@ -751,15 +750,15 @@ p.editable:hover i { margin-right: 10px; } -.repo .changes-container i.icon-plus-sign-alt { +.repo .changes-container i.fa-plus-square { color: rgb(73, 209, 73); } -.repo .changes-container i.icon-minus-sign-alt { +.repo .changes-container i.fa-minus-square { color: rgb(209, 73, 73); } -.repo .changes-container i.icon-edit-sign { +.repo .changes-container i.fa-pencil-square { color: rgb(73, 100, 209); } @@ -875,11 +874,11 @@ p.editable:hover i { width: 580px; } -.repo-admin .repo-access-state .state-icon i.icon-lock { +.repo-admin .repo-access-state .state-icon i.fa-lock { background: rgb(253, 191, 191); } -.repo-admin .repo-access-state .state-icon i.icon-unlock-alt { +.repo-admin .repo-access-state .state-icon i.fa-unlock-alt { background: rgb(170, 236, 170); } diff --git a/static/directives/repo-circle.html b/static/directives/repo-circle.html index 62986d4bf..8c03accc8 100644 --- a/static/directives/repo-circle.html +++ b/static/directives/repo-circle.html @@ -1,2 +1,2 @@ - - + + diff --git a/static/js/controllers.js b/static/js/controllers.js index f624c10b7..53edd400d 100644 --- a/static/js/controllers.js +++ b/static/js/controllers.js @@ -85,7 +85,7 @@ function HeaderCtrl($scope, $location, UserService, Restangular) { }, template: function (datum) { template = '
'; - template += '' + template += '' template += '' + datum.repo.namespace +'/' + datum.repo.name + '' if (datum.repo.description) { template += '' + getFirstTextLine(datum.repo.description) + '' @@ -485,7 +485,7 @@ function RepoAdminCtrl($scope, Restangular, $routeParams, $rootScope) { }, template: function (datum) { template = '
'; - template += '' + template += '' template += '' + datum.username + '' template += '
' return template; diff --git a/static/js/graphing.js b/static/js/graphing.js index 1066c0594..c38ee273e 100644 --- a/static/js/graphing.js +++ b/static/js/graphing.js @@ -1039,17 +1039,17 @@ ImageFileChangeTree.prototype.update_ = function(source) { node.select('.node-icon') .html(function(d) { if (!d.kind) { - var folder = d._children ? 'icon-folder-close' : 'icon-folder-open'; + var folder = d._children ? 'fa fa-folder' : 'fa fa-folder-open'; return ''; } var icon = { - 'added': 'plus-sign-alt', - 'removed': 'minus-sign-alt', - 'changed': 'edit-sign' + 'added': 'plus-square', + 'removed': 'minus-square', + 'changed': 'pencil-square' }; - return ''; + return ''; }); // Transition exiting nodes to the parent's new position. diff --git a/static/lib/browser-chrome.js b/static/lib/browser-chrome.js index deda3b11f..e0a129227 100644 --- a/static/lib/browser-chrome.js +++ b/static/lib/browser-chrome.js @@ -1,5 +1,5 @@ (function(browserchrome, $) { - var htmlTemplate = '
Tab Title
http://google.com/
' + var htmlTemplate = '
Tab Title
http://google.com/
' browserchrome.update = function() { $('[data-screenshot-url]').each(function(index, element) { diff --git a/static/lib/pagedown/Markdown.Editor.js b/static/lib/pagedown/Markdown.Editor.js index 6bf690ba9..30e1a7b79 100755 --- a/static/lib/pagedown/Markdown.Editor.js +++ b/static/lib/pagedown/Markdown.Editor.js @@ -1359,42 +1359,42 @@ } group1 = makeGroup(1); - buttons.bold = makeButton("wmd-bold-button", "Bold - Ctrl+B", "icon-bold", bindCommand("doBold"), group1); - buttons.italic = makeButton("wmd-italic-button", "Italic - Ctrl+I", "icon-italic", bindCommand("doItalic"), group1); + buttons.bold = makeButton("wmd-bold-button", "Bold - Ctrl+B", "fa fa-bold", bindCommand("doBold"), group1); + buttons.italic = makeButton("wmd-italic-button", "Italic - Ctrl+I", "fa fa-italic", bindCommand("doItalic"), group1); group2 = makeGroup(2); /* - buttons.link = makeButton("wmd-link-button", "Link - Ctrl+L", "icon-link", bindCommand(function (chunk, postProcessing) { + buttons.link = makeButton("wmd-link-button", "Link - Ctrl+L", "fa fa-link", bindCommand(function (chunk, postProcessing) { return this.doLinkOrImage(chunk, postProcessing, false); }), group2); */ - buttons.quote = makeButton("wmd-quote-button", "Blockquote - Ctrl+Q", "icon-quote-left", bindCommand("doBlockquote"), group2); - buttons.code = makeButton("wmd-code-button", "Code Sample - Ctrl+K", "icon-code", bindCommand("doCode"), group2); + buttons.quote = makeButton("wmd-quote-button", "Blockquote - Ctrl+Q", "fa fa-quote-left", bindCommand("doBlockquote"), group2); + buttons.code = makeButton("wmd-code-button", "Code Sample - Ctrl+K", "fa fa-code", bindCommand("doCode"), group2); /* - buttons.image = makeButton("wmd-image-button", "Image - Ctrl+G", "icon-picture", bindCommand(function (chunk, postProcessing) { + buttons.image = makeButton("wmd-image-button", "Image - Ctrl+G", "fa fa-picture", bindCommand(function (chunk, postProcessing) { return this.doLinkOrImage(chunk, postProcessing, true); }), group2); */ group3 = makeGroup(3); - buttons.olist = makeButton("wmd-olist-button", "Numbered List - Ctrl+O", "icon-list", bindCommand(function (chunk, postProcessing) { + buttons.olist = makeButton("wmd-olist-button", "Numbered List - Ctrl+O", "fa fa-list", bindCommand(function (chunk, postProcessing) { this.doList(chunk, postProcessing, true); }), group3); - buttons.ulist = makeButton("wmd-ulist-button", "Bulleted List - Ctrl+U", "icon-list-ul", bindCommand(function (chunk, postProcessing) { + buttons.ulist = makeButton("wmd-ulist-button", "Bulleted List - Ctrl+U", "fa fa-list-ul", bindCommand(function (chunk, postProcessing) { this.doList(chunk, postProcessing, false); }), group3); - buttons.heading = makeButton("wmd-heading-button", "Heading - Ctrl+H", "icon-tasks", bindCommand("doHeading"), group3); - buttons.hr = makeButton("wmd-hr-button", "Horizontal Rule - Ctrl+R", "icon-minus", bindCommand("doHorizontalRule"), group3); + buttons.heading = makeButton("wmd-heading-button", "Heading - Ctrl+H", "fa fa-tasks", bindCommand("doHeading"), group3); + buttons.hr = makeButton("wmd-hr-button", "Horizontal Rule - Ctrl+R", "fa fa-minus", bindCommand("doHorizontalRule"), group3); group4 = makeGroup(4); - buttons.undo = makeButton("wmd-undo-button", "Undo - Ctrl+Z", "icon-undo", null, group4); + buttons.undo = makeButton("wmd-undo-button", "Undo - Ctrl+Z", "fa fa-undo", null, group4); buttons.undo.execute = function (manager) { if (manager) manager.undo(); }; var redoTitle = /win/.test(nav.platform.toLowerCase()) ? "Redo - Ctrl+Y" : "Redo - Ctrl+Shift+Z"; // mac and other non-Windows platforms - buttons.redo = makeButton("wmd-redo-button", redoTitle, "icon-share-alt", null, group4); + buttons.redo = makeButton("wmd-redo-button", redoTitle, "fa fa-share", null, group4); buttons.redo.execute = function (manager) { if (manager) manager.redo(); }; if (helpOptions) { @@ -1402,7 +1402,7 @@ group5.className = group5.className + " pull-right"; var helpButton = document.createElement("button"); var helpButtonImage = document.createElement("i"); - helpButtonImage.className = "icon-question-sign"; + helpButtonImage.className = "fa fa-question-sign"; helpButton.appendChild(helpButtonImage); helpButton.className = "btn"; helpButton.id = "wmd-help-button" + postfix; diff --git a/static/partials/header.html b/static/partials/header.html index 321e08612..2590c0a4b 100644 --- a/static/partials/header.html +++ b/static/partials/header.html @@ -2,9 +2,9 @@
diff --git a/static/partials/image-view.html b/static/partials/image-view.html index 99523f61e..5e4477116 100644 --- a/static/partials/image-view.html +++ b/static/partials/image-view.html @@ -3,14 +3,14 @@
- +
- +

- + {{repo.namespace}} / {{repo.name}} @@ -31,7 +31,7 @@
- +

@@ -75,7 +75,7 @@ No matching changes
- + {{folder}}/{{getFilename(change.file)}} diff --git a/static/partials/landing.html b/static/partials/landing.html index 890566750..f425552e5 100644 --- a/static/partials/landing.html +++ b/static/partials/landing.html @@ -10,7 +10,7 @@
- +

Your Top Repositories

@@ -44,10 +44,10 @@ @@ -68,7 +68,7 @@
- + Secure Store your private docker containers where only you and your team @@ -77,7 +77,7 @@
- + Shareable Have to share a repository? No problem! Share with anyone you choose @@ -85,7 +85,7 @@
- + Cloud Hosted Accessible from anywhere, anytime @@ -97,7 +97,7 @@
-
+
Take a tour of Quay
diff --git a/static/partials/repo-admin.html b/static/partials/repo-admin.html index b7ebbce1e..f8c2a0428 100644 --- a/static/partials/repo-admin.html +++ b/static/partials/repo-admin.html @@ -1,5 +1,5 @@
- +
@@ -8,7 +8,7 @@
- +

{{repo.namespace}} / {{repo.name}}

@@ -18,7 +18,7 @@
User Access Permissions - +
@@ -33,7 +33,7 @@ - + {{username}} @@ -46,7 +46,7 @@ - + @@ -64,7 +64,7 @@
Access Token Permissions - +
@@ -79,7 +79,7 @@ - + {{ token.friendlyName }} @@ -91,7 +91,7 @@ - + @@ -114,7 +114,7 @@
Repository Settings
-
+
This repository is currently private. Only users on the above access list may view and interact with it. @@ -124,7 +124,7 @@
-
+
This repository is currently public and is visible to all users, and may be pulled by all users. @@ -171,7 +171,7 @@
-

{{ shownToken.friendlyName }}

+

{{ shownToken.friendlyName }}

The docker username is $token and the password is the token. You may use any value for email.
diff --git a/static/partials/repo-list.html b/static/partials/repo-list.html index a1292e6f2..602c08265 100644 --- a/static/partials/repo-list.html +++ b/static/partials/repo-list.html @@ -1,5 +1,5 @@
- +
diff --git a/static/partials/signin.html b/static/partials/signin.html index da203d1c8..71821ec0a 100644 --- a/static/partials/signin.html +++ b/static/partials/signin.html @@ -18,11 +18,11 @@ - Sign In with GitHub + Sign In with GitHub
Invalid username or password.
diff --git a/static/partials/user-admin.html b/static/partials/user-admin.html index 16df0fe00..8408863fb 100644 --- a/static/partials/user-admin.html +++ b/static/partials/user-admin.html @@ -1,6 +1,6 @@
- +
@@ -18,7 +18,7 @@
{{ plan.title }} - + Subscribed
@@ -59,7 +59,7 @@
- +
diff --git a/static/partials/view-repo.html b/static/partials/view-repo.html index fc0587ad4..671b06fba 100644 --- a/static/partials/view-repo.html +++ b/static/partials/view-repo.html @@ -3,7 +3,7 @@
- +
@@ -16,7 +16,7 @@ - + @@ -29,7 +29,7 @@
- +
@@ -44,7 +44,7 @@

- +

@@ -62,7 +62,7 @@
- {{getTagCount(repo)}} + {{getTagCount(repo)}} {{currentTag.name}}
  • @@ -76,7 +76,7 @@
    - +
    @@ -90,7 +90,7 @@
    - {{imageHistory.length}} + {{imageHistory.length}} {{currentImage.id.substr(0, 12)}}
    • @@ -117,22 +117,22 @@
      - +
      - + {{currentImageChanges.added.length}} - + {{currentImageChanges.removed.length}} - + {{currentImageChanges.changed.length}}
      @@ -140,15 +140,15 @@
      - + {{file}}
      - + {{file}}
      - + {{file}}
      diff --git a/templates/base.html b/templates/base.html index 50cb9b482..99c58d690 100644 --- a/templates/base.html +++ b/templates/base.html @@ -12,7 +12,7 @@ - +