The Unified and Autonomous Development Platform
Use round avatar instead of rect avatar
robin shineccf8d998ffb3
diff --git a/.gitignore b/.gitignoreindex b1b6246618..471ed42b40 100644--- a/.gitignore+++ b/.gitignore@@ -1,25 +1,25 @@-*/target/**-*/bin/**-.metadata/-.recommenders/-.idea/-**/.classpath-.project-**/.project-**/*.iml-.settings/**-*/.settings/**-release.properties-pom.xml.releaseBackup--.loadpath-*.class-*~-*.lock-*.swp-*.out-*.tmp-*.bak-*~.nib-*.DS_Store-*.log+*/target/**+*/bin/**+.metadata/+.recommenders/+.idea/+**/.classpath+.project+**/.project+**/*.iml+.settings/**+*/.settings/**+release.properties+pom.xml.releaseBackup++.loadpath+*.class+*~+*.lock+*.swp+*.out+*.tmp+*.bak+*~.nib+*.DS_Store+*.logdiff --git a/commons.wicket/src/main/java/com/gitplex/commons/wicket/AbstractWicketConfig.java b/commons.wicket/src/main/java/com/gitplex/commons/wicket/AbstractWicketConfig.javaindex abd69ec6d8..c029a1871f 100644--- a/commons.wicket/src/main/java/com/gitplex/commons/wicket/AbstractWicketConfig.java+++ b/commons.wicket/src/main/java/com/gitplex/commons/wicket/AbstractWicketConfig.java@@ -124,13 +124,14 @@ public abstract class AbstractWicketConfig extends WebApplication {}});-- List<Class<?>> resourcePackScopes = new ArrayList<>();- for (ResourcePackScopeContribution contribution: AppLoader.getExtensions(ResourcePackScopeContribution.class)) {- resourcePackScopes.addAll(contribution.getResourcePackScopes());++ if (Bootstrap.prodMode) {+ List<Class<?>> resourcePackScopes = new ArrayList<>();+ for (ResourcePackScopeContribution contribution: AppLoader.getExtensions(ResourcePackScopeContribution.class)) {+ resourcePackScopes.addAll(contribution.getResourcePackScopes());+ }+ new PackageResourceBundler(WicketModule.class, resourcePackScopes.toArray(new Class<?>[resourcePackScopes.size()])).install(this);}-- new PackageResourceBundler(WicketModule.class, resourcePackScopes.toArray(new Class<?>[resourcePackScopes.size()])).install(this);}@Overridediff --git a/server.web/src/main/java/com/gitplex/server/web/component/avatar/avatar.css b/server.web/src/main/java/com/gitplex/server/web/component/avatar/avatar.cssindex 73df1e711a..e6c2859002 100644--- a/server.web/src/main/java/com/gitplex/server/web/component/avatar/avatar.css+++ b/server.web/src/main/java/com/gitplex/server/web/component/avatar/avatar.css@@ -1,39 +1,39 @@-img.avatar {- border-radius: 3px;- height: 24px;- width: 24px;-}-.contributor-avatars {- position: relative;-}-.contributor-avatars .author .avatar {- height: 36px;- width: 36px;-}-.contributor-avatars .committer .avatar {- position: absolute;- height: 16px;- width: 16px;- left: 22px;- top: 13px;-}--.removeable-avatar {- position: relative;- display: block;-}-.removeable-avatar img {- width: 32px !important;- height: 32px !important;-}-.removeable-avatar i {- display: none;- color: red;- font-size: 30px;- position: absolute;- left: 4px;- top: 1px;-}-a.removeable-avatar:hover i {- display: inline;-}+img.avatar {+ border-radius: 1000px;+ height: 24px;+ width: 24px;+}+.contributor-avatars {+ position: relative;+}+.contributor-avatars .author .avatar {+ height: 36px;+ width: 36px;+}+.contributor-avatars .committer .avatar {+ position: absolute;+ height: 16px;+ width: 16px;+ left: 22px;+ top: 13px;+}++.removeable-avatar {+ position: relative;+ display: block;+}+.removeable-avatar img {+ width: 32px !important;+ height: 32px !important;+}+.removeable-avatar i {+ display: none;+ color: red;+ font-size: 30px;+ position: absolute;+ left: 4px;+ top: 1px;+}+a.removeable-avatar:hover i {+ display: inline;+}diff --git a/server.web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/integrationpreview/integration-preview.css b/server.web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/integrationpreview/integration-preview.cssindex 6b70d37eea..daf21e4b11 100644--- a/server.web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/integrationpreview/integration-preview.css+++ b/server.web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/integrationpreview/integration-preview.css@@ -1,7 +1,5 @@#request-detail>.integration-preview>.available>.head {margin-bottom: 20px;- padding-bottom: 20px;- border-bottom: 1px dotted #BBB;font-size: 16px;}#request-detail>.integration-preview>.available>.head .out-dated {diff --git a/server.web/src/main/java/com/gitplex/server/web/page/layout/layout.css b/server.web/src/main/java/com/gitplex/server/web/page/layout/layout.cssindex e5bf44d2e2..739c215847 100644--- a/server.web/src/main/java/com/gitplex/server/web/page/layout/layout.css+++ b/server.web/src/main/java/com/gitplex/server/web/page/layout/layout.css@@ -1,172 +1,173 @@-html, body {- background: #F7F6F2;-}-#main>.head {- background: #010203;- padding: 8px 16px;-}-#main>.head>div {- margin-right: 20px;-}-#main>.head a {- text-decoration: none;- color: #CCC;-}-#main>.head>.logo .fa {- font-size: 28px;- color: #EEE;-}-#main>.head>.context {- color: #CCC;- font-size: 20px;-}-#main>.head>.search {- padding-top: 2px;- position: relative;-}-#main>.head>.search input {- background: #333;- border: 1px solid #333;- box-shadow: none;- transition: none;- color: #CCC;-}-#main>.head>.search input:FOCUS {- background: #DDD;- border-color: #DDD;- color: #333;-}-#main>.head>.actions {- padding-top: 7px;-}-#main>.head>.actions>a {- margin-right: 20px;-}-#main>.head>.actions a .fa {- font-size: 18px;-}-#main>.head>.account {- margin-right: 0;-}-#main>.head>.account>.logged-in>.tasks {- color: #69B7F7;-}-#main>.head>.account>.logged-in>a, #main>.head>.account>.logged-in>span {- margin-right: 8px;- font-size: 20px;-}-#main>.head>.account>.logged-in>.menu {- margin-right: 8px;-}-#main>.head>.account>.logged-out {- padding-top: 4px;-}-#main>.head>.account>.logged-out a {- font-size: 16px;-}-#main>.head>.account>.logged-out>a:FIRST-CHILD {- margin-right: 16px;-}-#main>.head>.account .avatar {- width: 32px;- height: 32px;-}--#main>.body {- border-bottom: 1px solid #BBB;- background: white;-}--.sidebar>table>tbody>tr>td.nav {- padding: 20px 0;- width: 1px;- border-right: 1px solid #DDD;-}-.sidebar>table>tbody>tr>td.nav>.tabs {- margin-bottom: 0;-}-.sidebar>table>tbody>tr>td.nav>.tabs>li>a {- color: #666;- display: block;- text-decoration: none;- padding: 12px;- padding-right: 8px;- white-space: nowrap;- border-right: 4px solid white;- width: 180px;- font-family: Consolas, "Liberation Mono", Menlo, Courier, monospace;- clear: both;- position: relative;-}-.sidebar>table>tbody>tr>td.nav>.tabs>li>a .fa {- font-size: 16px;- margin-right: 4px;-}-.sidebar>table>tbody>tr>td.nav>.tabs>li:hover>a {- color: #010203;- border-right-color: #777;-}-.sidebar>table>tbody>tr>td.nav>.tabs>li.active>a {- color: #010203;- border-right-color: #010203;- font-weight: bold;-}-.sidebar>table>tbody>tr>td.nav>.tabs>li>a .badge {- position: absolute;- right: 4px;- color: #888;- background: #EEE;-}-#main>.foot {- font-size: 11px;- padding: 8px;-}-#main>.foot>div {- white-space: nowrap;-}-section>.head {- font-size: 18px;- margin-bottom: 20px;-}--.floating>.content>.create-new {- padding: 12px;-}-.floating>.content>.create-new>a {- display: block;- text-decoration: none;- color: #444;- padding: 4px 8px;-}-.floating>.content>.create-new>a:hover {- background: #F0F0F0;-}--.create.depot {- padding: 20px;-}--.floating>.content>.user {- padding: 12px 0;-}-.floating>.content>.user a {- display: block;- color: #555;- text-decoration: none;- padding: 8px 12px;-}-.floating>.content>.user a:hover {- background: #F2F2F2;-}-.floating>.content>.user .organizations .title {- color: #999;- font-size: 16px;- padding: 0 12px 4px 12px;-}-.floating>.content>.user .organizations {- border-bottom: 1px solid #DDD;- margin-bottom: 8px;-}-.floating>.content>.user .organizations .avatar {- margin-right: 4px;+html, body {+ background: #F7F6F2;+}+#main>.head {+ background: #010203;+ padding: 8px 16px;+}+#main>.head>div {+ margin-right: 20px;+}+#main>.head a {+ text-decoration: none;+ color: #CCC;+}+#main>.head>.logo .fa {+ font-size: 28px;+ color: #EEE;+}+#main>.head>.context {+ color: #CCC;+ font-size: 20px;+}+#main>.head>.search {+ padding-top: 2px;+ position: relative;+}+#main>.head>.search input {+ background: #333;+ border: 1px solid #333;+ box-shadow: none;+ transition: none;+ color: #CCC;+}+#main>.head>.search input:FOCUS {+ background: #DDD;+ border-color: #DDD;+ color: #333;+}+#main>.head>.actions {+ padding-top: 7px;+}+#main>.head>.actions>a {+ margin-right: 20px;+}+#main>.head>.actions a .fa {+ font-size: 18px;+}+#main>.head>.account {+ margin-right: 0;+}+#main>.head>.account>.logged-in>.tasks {+ color: #69B7F7;+ margin-right: 16px;+}+#main>.head>.account>.logged-in>a, #main>.head>.account>.logged-in>span {+ margin-right: 8px;+ font-size: 20px;+}+#main>.head>.account>.logged-in>.menu {+ margin-right: 8px;+}+#main>.head>.account>.logged-out {+ padding-top: 4px;+}+#main>.head>.account>.logged-out a {+ font-size: 16px;+}+#main>.head>.account>.logged-out>a:FIRST-CHILD {+ margin-right: 16px;+}+#main>.head>.account .avatar {+ width: 32px;+ height: 32px;+}++#main>.body {+ border-bottom: 1px solid #BBB;+ background: white;+}++.sidebar>table>tbody>tr>td.nav {+ padding: 20px 0;+ width: 1px;+ border-right: 1px solid #DDD;+}+.sidebar>table>tbody>tr>td.nav>.tabs {+ margin-bottom: 0;+}+.sidebar>table>tbody>tr>td.nav>.tabs>li>a {+ color: #666;+ display: block;+ text-decoration: none;+ padding: 12px;+ padding-right: 8px;+ white-space: nowrap;+ border-right: 4px solid white;+ width: 180px;+ font-family: Consolas, "Liberation Mono", Menlo, Courier, monospace;+ clear: both;+ position: relative;+}+.sidebar>table>tbody>tr>td.nav>.tabs>li>a .fa {+ font-size: 16px;+ margin-right: 4px;+}+.sidebar>table>tbody>tr>td.nav>.tabs>li:hover>a {+ color: #010203;+ border-right-color: #777;+}+.sidebar>table>tbody>tr>td.nav>.tabs>li.active>a {+ color: #010203;+ border-right-color: #010203;+ font-weight: bold;+}+.sidebar>table>tbody>tr>td.nav>.tabs>li>a .badge {+ position: absolute;+ right: 4px;+ color: #888;+ background: #EEE;+}+#main>.foot {+ font-size: 11px;+ padding: 8px;+}+#main>.foot>div {+ white-space: nowrap;+}+section>.head {+ font-size: 18px;+ margin-bottom: 20px;+}++.floating>.content>.create-new {+ padding: 12px;+}+.floating>.content>.create-new>a {+ display: block;+ text-decoration: none;+ color: #444;+ padding: 4px 8px;+}+.floating>.content>.create-new>a:hover {+ background: #F0F0F0;+}++.create.depot {+ padding: 20px;+}++.floating>.content>.user {+ padding: 12px 0;+}+.floating>.content>.user a {+ display: block;+ color: #555;+ text-decoration: none;+ padding: 8px 12px;+}+.floating>.content>.user a:hover {+ background: #F2F2F2;+}+.floating>.content>.user .organizations .title {+ color: #999;+ font-size: 16px;+ padding: 0 12px 4px 12px;+}+.floating>.content>.user .organizations {+ border-bottom: 1px solid #DDD;+ margin-bottom: 8px;+}+.floating>.content>.user .organizations .avatar {+ margin-right: 4px;}\ No newline at end of file