THIS IS A TEST INSTANCE ONLY! REPOSITORIES CAN BE DELETED AT ANY TIME!

Browse Source

add background-image for site intro

remove hover event of feature list on site intro
resize heading size
changed background color of dropdown menu title
tags/v1.0.0-beta
insanehong 6 years ago
parent
commit
a9fb39200c
7 changed files with 89 additions and 48 deletions
  1. +69
    -31
      app/assets/stylesheets/less/_page.less
  2. +1
    -0
      app/assets/stylesheets/less/_variables.less
  3. +11
    -12
      app/assets/stylesheets/less/_yobiUI.less
  4. +2
    -2
      app/views/project/header.scala.html
  5. +5
    -2
      app/views/siteintro.scala.html
  6. +1
    -1
      conf/messages.en
  7. BIN
      public/images/yobi_intro_code.jpg

+ 69
- 31
app/assets/stylesheets/less/_page.less View File

@@ -33,6 +33,7 @@

&:hover, &:active {
line-height:43px;
background-color:@yobi-orange-dark;
}

img {
@@ -146,7 +147,7 @@

.gnb {
li.item {
margin:8px 10px ;
margin:7px 10px ;
line-height:20px;
}

@@ -172,7 +173,13 @@
border-right: 4px solid transparent;
border-left: 4px solid transparent;
content: "";
}
}

li {
margin-right:5px;
margin-left:5px;

}
}
}

@@ -195,6 +202,13 @@
> a {
padding:5px 10px;
}

&.item {
padding:0;
margin:0;
margin-top:4px;
margin-right:10px;
}
}
}

@@ -213,7 +227,7 @@
}

.gnb-search-bar {
margin:5px 5px 5px 0;
margin:5px 10px 5px 0;

input {
height:20px;
@@ -638,11 +652,12 @@
}

.siteintro {

background-image:url('/assets/images/img_front.jpg');
background-position: bottom;
background-size: 100% 240px;
background-repeat : no-repeat;
.siteintro-cover {
padding:80px 40px;
background-color: @yobi-inverse-dark;

padding:100px 60px 80px;
}

.siteintro-wrap {
@@ -652,9 +667,10 @@
.site-heading {
margin:0 ;
padding:0;
color:@yobi-primary;
font-size:56px;
line-height:1.3;
color: #BDBDBD;
text-shadow: 1px 1px 2px rgba(0,0,0,.75);
}

.site-features {
@@ -666,8 +682,7 @@

li {
display:inline-block;
color:#FFF;
font-size:20px;
font-size:16.5px;
line-height:1.5;
margin-left:15px;

@@ -689,12 +704,12 @@
}
.feature {
clear:both;
padding: 20px 40px 80px;
padding: 0 40px 40px;
text-align:center;
background-color:@yobi-white-dark;
h2 {
margin:0;
padding:50px 0 40px;
padding:40px 0 20px;
font-size: 40px;

strong {
color:@yobi-primary;
@@ -722,7 +737,8 @@
border: 1px solid rgba(0, 0, 0, 0.15);
overflow:hidden;
position:relative;
background-color:@yobi-cyan-light;

&:nth-child(3n+2) {
border-right: none;
border-left: none;
@@ -732,6 +748,10 @@
border-bottom: none;
}

&:nth-child(2n) {
background-color:@yobi-white;
}

.feature-image {
color:@yobi-primary;
text-align: center;
@@ -755,29 +775,36 @@
min-height:60px;
}

&:hover {
.feature-image {
color:@yobi-green;
}

}
}
}
}

.getting-started {
text-align:center;
background:@yobi-inverse-light;
padding:60px 0px 80px;

padding:40px 0 0;
border-bottom:1px solid rgba(0,0,0, .15);
overflow: hidden;
h2 {
padding: 0 40px 30px;
color:@yobi-white;
padding: 0 40px 50px;
font-size:40px;

strong {
color:@yobi-primary;
}
}

.issue-image {
margin-top:60px;
padding:0 60px;
overflow:hidden;
img {
.border-radius(6px 6px 0 0);
vertical-align:buttom;
border:1px solid rgba(0,0,0, .15);
border-bottom:none;
}
}
}

.site-guide-outer {
@@ -861,7 +888,7 @@
}

&:nth-child(odd) {
background-color:@yobi-white-dark;
background-color:@yobi-cyan-light;

}

@@ -1179,7 +1206,19 @@
.my-projects {
border:1px solid #ddd;
margin-bottom:10px;
.title { background:#f7f7f7; padding:10px; display:block; font-weight:bold; border-bottom:1px solid #eee; margin-bottom:10px;}
.border-radius(6px 6px 0 0);

.title {
background-color:@yobi-cyan-light;
padding:10px;
display:block;
font-weight:bold;
.border-radius(6px 6px 0 0);

border-bottom:1px solid rgba(0,0,0, .15);
margin-bottom:10px;
}

.my-project {
position:relative;
padding-left: 15px;
@@ -3804,8 +3843,7 @@ div.markdown-preview {

.whoami {
width:100%; height:50px; left:0;
background: rgba(0,0,0,0.85);
border-top:5px solid @primary;
background: rgba(0,0,0,0.55);
color:#fff;
text-shadow:1px 1px #000;
text-align:left; line-height:120%;


+ 1
- 0
app/assets/stylesheets/less/_variables.less View File

@@ -86,6 +86,7 @@

@yobi-cyan : #6C8DAC;
@yobi-cyan-dark :#4A7EAF;
@yobi-cyan-light : #f2f4f5;
@yobi-green : #24A05F;
@yobi-green-dark : #179157;
@yobi-blue : #3A7EE5;


+ 11
- 12
app/assets/stylesheets/less/_yobiUI.less View File

@@ -588,7 +588,7 @@ button.nbtn {
line-height: 16px !important;
}

&.ybtn-primary, &.ybtn-success,&.ybtn-info, &.ybtn-danger,&.ybtn-inverse, &.ybtn-disabled, &ybtn-warning, &.ybtn-transparent {
&.ybtn-primary, &.ybtn-success,&.ybtn-info, &.ybtn-danger,&.ybtn-inverse, &.ybtn-disabled, &ybtn-warning, &.ybtn-transparent, &.ybtn-watching {
color:@yobi-white;
}

@@ -615,11 +615,11 @@ button.nbtn {
}

&.ybtn-success {
background-color : @yobi-btn-success !important;
border:1px solid @yobi-btn-success-hover;
background-color : @yobi-btn-primary !important;
border:1px solid @yobi-btn-primary-hover;

&:hover, &:focus, &:active, &:focus {
background-color: @yobi-btn-success-hover !important;
background-color: @yobi-btn-primary-hover !important;
}
}

@@ -679,10 +679,10 @@ button.nbtn {

&.ybtn-watching {
background-color : @yobi-btn-success !important;
border:none;
color:#FFF;
border:1px solid @yobi-btn-success-hover;
&:hover, &:focus {
background-color: @yobi-btn-disabled !important;
background-color: @yobi-btn-success-hover !important;
}
}

@@ -717,7 +717,7 @@ button.nbtn {
}
}

&.ybtn-success,&.ybtn-primary, &.ybtn-info, &.ybtn-danger,&.ybtn-inverse, &.ybtn-disabled, &ybtn-warning {
&.ybtn-success,&.ybtn-primary, &.ybtn-info, &.ybtn-danger,&.ybtn-inverse, &.ybtn-disabled, &ybtn-warning,&.ybtn-watching {
&:after {
border-top: 4px solid @yobi-white !important;
}
@@ -799,7 +799,7 @@ button.nbtn {

.pop-title {
.border-radius(3px);
background: @yobi-white-dark;
background: @yobi-cyan-light;
padding:3px 0;
padding: 3px 11px 5px;
margin:5px 3px;
@@ -837,8 +837,7 @@ button.nbtn {
}

li {

margin: 0 4px 2px;
margin: 0 5px 2px !important;
white-space:nowrap;
float:none !important;
background-color:@yobi-white;
@@ -879,7 +878,7 @@ button.nbtn {

&.title {
.border-radius(3px);
background: @yobi-white-dark;
background:@yobi-cyan-light;
padding:3px 0;
padding: 3px 11px 5px;
margin:5px 3px;


+ 2
- 2
app/views/project/header.scala.html View File

@@ -72,7 +72,7 @@
</li>
<li>
@if(User.isWatching(project)) {
<button class="ybtn ybtn-primary ybtn-small dropdown-toggle" tyle="button" data-toggle="dropdown">
<button class="ybtn ybtn-watching ybtn-small dropdown-toggle" tyle="button" data-toggle="dropdown">
<i class="yobicon-eye"></i> @Messages("project.watching")
</button>
} else {
@@ -111,7 +111,7 @@
</ul>
</div>
<div class="pop-content btn-wrap">
<a class="ybtn ybtn-primary watchBtn" href="@routes.WatchProjectApp.watch(project.owner, project.name)">
<a class="ybtn ybtn-watching watchBtn" href="@routes.WatchProjectApp.watch(project.owner, project.name)">
<i class="yobicon-eye"></i>
@Messages("project.watch")
</a>


+ 5
- 2
app/views/siteintro.scala.html View File

@@ -3,8 +3,8 @@
<div class="siteintro-wrap">
<h1 class="site-heading">Software Development Platform</h1>
<ul class="site-features">
<li><strong>Public</strong> or <strong>Private</strong> Projects.</li>
<li><strong>GIT</strong> or <strong>SVN</strong> Repository.</li>
<li>Public or Private Projects.</li>
<li>Code Repository.</li>
<li>Code Review.</li>
<li>Issue Tracker.</li>
</ul>
@@ -60,4 +60,7 @@
<a href="@routes.ProjectApp.newProjectForm()" class="ybtn ybtn-success ybtn-maximum">
<i class="yobicon-database-add"></i> @Messages("button.newProject")
</a>
<div class="issue-image">
<img src="@routes.Assets.at("images/yobi_intro_code.jpg")" />
</div>
</div>

+ 1
- 1
conf/messages.en View File

@@ -533,7 +533,7 @@ title.contentSearchResult = Content Search Result
title.editIssue = Edit Issue
title.editMilestone = Edit Milestone
title.editPullRequest = Edit Pull Request
title.features = Features
title.features = Key Features
title.forgotpassword = Forgot password?
title.help = FAQ
title.gettingStarted = Getting started your new project with <strong>{0}</strong>


BIN
public/images/yobi_intro_code.jpg View File

Before After
Width: 1253  |  Height: 365  |  Size: 73 KiB

Loading…
Cancel
Save