Merge branch 'master' into git

static/css/pages/image-view.css

@@ -0,0 +1,25 @@
+.image-view .image-view-header {
+  padding: 10px;
+  background: #e8f1f6;
+  margin: -10px;
+  margin-bottom: 20px;
+}
+
+.image-view .image-view-header .section-icon {
+  margin-right: 6px;
+}
+
+.image-view .image-view-header .section {
+  padding: 4px;
+  display: inline-block;
+  margin-right: 20px;
+}
+
+.image-view .co-tab-content {
+  padding: 20px;
+  padding-top: 10px;
+}
+
+.image-view .co-tab-content h3 {
+  margin-bottom: 20px;
+}

static/css/pages/new-organization.css

@@ -0,0 +1,4 @@
+.new-organization .co-main-content-panel {
+  padding: 30px;
+  position: relative;
+}

static/css/pages/new-repo.css

@@ -0,0 +1,90 @@
+.new-repo .co-main-content-panel {
+  padding: 30px;
+}
+
+.new-repo .namespace-selector-header .slash {
+  color: #444;
+  padding-left: 6px;
+  padding-right: 6px;
+}
+
+.new-repo .required-plan {
+  margin: 10px;
+  margin-top: 20px;
+  margin-left: 50px;
+}
+
+.new-repo .required-plan .alert {
+  color: #444 !important;
+}
+
+.new-repo .new-header .popover {
+  font-size: 14px;
+}
+
+.new-repo .new-header .repo-circle {
+   margin-right: 14px;
+}
+
+.new-repo .new-header .name-container {
+   display: inline-block;
+   width: 300px;
+   vertical-align: middle;
+}
+
+.new-repo .description {
+  margin-left: 10px;
+  margin-top: 10px;
+}
+
+.new-repo .section {
+  padding-bottom: 20px;
+  border-bottom: 1px solid #eee;
+  margin-bottom: 16px;
+}
+
+.new-repo .section-title {
+  float: right;
+  color: #aaa;
+}
+
+.new-repo .repo-option {
+  margin: 6px;
+  margin-top: 16px;
+}
+
+.new-repo .repo-option label {
+  font-weight: normal;
+}
+
+.new-repo .repo-option i {
+  font-size: 18px;
+  padding-left: 10px;
+  padding-right: 10px;
+  width: 42px;
+  display: inline-block;
+  text-align: center;
+}
+
+.new-repo .option-description {
+  display: inline-block;
+  vertical-align: top;
+}
+
+.new-repo .option-description label {
+  display: block;
+}
+
+.new-repo .cbox {
+  margin: 10px;
+}
+
+.new-repo .initialize-repo {
+  margin: 10px;
+  margin-top: 16px;
+  margin-left: 20px;
+}
+
+.new-repo .initialize-repo .file-drop {
+  margin: 10px;
+}

static/css/pages/org-view.css

@@ -0,0 +1,26 @@
+.org-view .organization-name {
+  vertical-align: middle;
+  margin-left: 6px;
+}
+
+.org-view h3 {
+  margin-bottom: 20px;
+  margin-top: 0px;
+}
+
+.org-view .section-description-header {
+  padding-left: 40px;
+  position: relative;
+  margin-bottom: 20px;
+  min-height: 50px;
+}
+
+.org-view .section-description-header:before {
+  font-family: FontAwesome;
+  content: "\f05a";
+  position: absolute;
+  top: -4px;
+  left: 6px;
+  font-size: 27px;
+  color: #888;
+}

static/css/pages/repo-list.css

@@ -24,3 +24,15 @@
 .repo-list .namespaces-list li .avatar {
   margin-right: 10px;
 }
+
+.repo-list .new-org {
+  margin-top: 20px !important;
+  padding-top: 14px;
+  border-top: 1px solid #eee;
+}
+
+.repo-list .new-org i.fa {
+  width: 30px;
+  margin-right: 10px;
+  text-align: center;
+}

static/css/pages/repo-view.css

@@ -44,3 +44,7 @@
 .repository-view .heading-controls .btn .fa {
   margin-right: 6px;
 }
+
+.repository-view .tag-span {
+  white-space: nowrap;
+}

static/css/pages/team-view.css

@@ -0,0 +1,55 @@
+.team-view .co-main-content-panel {
+  padding: 20px;
+}
+
+.team-view .team-name {
+  vertical-align: middle;
+  margin-left: 6px;
+}
+
+.team-view .team-view-header {
+  border-bottom: 1px solid #eee;
+  margin-bottom: 10px;
+  padding-bottom: 10px;
+}
+
+.team-view .team-view-header button i.fa {
+  margin-right: 4px;
+}
+
+.team-view .team-view-header > h3 {
+  margin-top: 10px;
+}
+
+.team-view .team-view-header .popover {
+  max-width: none !important;
+}
+
+.team-view .team-view-header .popover.bottom-right .arrow:after {
+  border-bottom-color: #f7f7f7;
+  top: 2px;
+}
+
+.team-view .team-view-header .popover-content {
+  font-size: 14px;
+  padding-top: 6px;
+  min-width: 500px;
+}
+
+.team-view .team-view-header .popover-content input {
+  background: white;
+}
+
+.team-view .team-view-add-element .help-text {
+  font-size: 13px;
+  color: #ccc;
+  margin-top: 10px;
+}
+
+.team-view .co-table-header-row td {
+  padding-top: 20px !important;
+}
+
+.team-view .co-table-header-row:first-child td {
+  padding-top: 10px !important;
+}

static/css/pages/tutorial.css

@@ -0,0 +1,3 @@
+.tutorial-view .co-main-content-panel {
+  padding: 30px;
+}

static/css/pages/user-view.css

@@ -0,0 +1,55 @@
+.user-view .user-name {
+  vertical-align: middle;
+  margin-left: 6px;
+}
+
+.user-view .user-repo-list {
+  padding: 20px;
+}
+
+.user-view h3 {
+  margin-bottom: 20px;
+  margin-top: 0px;
+}
+
+.user-view .section-description-header {
+  padding-left: 40px;
+  position: relative;
+  margin-bottom: 20px;
+  min-height: 50px;
+}
+
+.user-view .section-description-header:before {
+  font-family: FontAwesome;
+  content: "\f05a";
+  position: absolute;
+  top: -4px;
+  left: 6px;
+  font-size: 27px;
+  color: #888;
+}
+
+.user-view .user-settings-form .row {
+  padding: 10px;
+  margin: 0px;
+}
+
+.user-view .co-panel {
+  position: relative;
+  min-height: 50px;
+}
+
+.user-view .co-panel .panel-body {
+  position: relative;
+}
+
+.user-view .co-panel .row {
+  margin: 10px;
+}
+
+.user-view .co-panel .row .panel {
+  margin-bottom: 20px;
+  border-bottom: 0px;
+  box-shadow: none;
+}
+