zydronium/neocities
1
0
Fork 0
mirror of https://github.com/neocities/neocities.git synced 2025-04-24 17:22:35 +02:00
Code Issues Projects Releases Packages Wiki Activity

fix merges in css

Browse source
This commit is contained in:
Kyle Drake 2014-06-06 21:54:52 -07:00
commit e9b7826621
4 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
public/assets/css/_base-sass/_forms.scss
View file

@ -29,7 +29,7 @@ legend, .legend{
.input-Area, %input-Area{
background:#fff;
border:1px solid $c-Border;
border:2px solid $c-Border;
font-family:$arial;
line-height:1.25;
margin-bottom:$spacing*2;
@ -37,7 +37,7 @@ legend, .legend{
width:80%;
&:focus{
background:$c-Lighter;
border:1px solid #50B6D5;
border:2px solid #50B6D5;
@include box-shadow($bs-2)
}
}

4
public/assets/css/neo.css
View file

@ -329,7 +329,7 @@ legend, .legend {
.input-Area, .text-Area, .select-Container, .input-Number {
background: #fff;
border: 1px solid #cccccc;
border: 2px solid #cccccc;
font-family: Arial, "Helvetica Neue", Helvetica, sans-serif;
line-height: 1.25;
margin-bottom: 8px;
@ -337,7 +337,7 @@ legend, .legend {
width: 80%; }
.input-Area:focus, .text-Area:focus, .select-Container:focus, .input-Number:focus {
background: #f8f8f8;
border: 1px solid #50B6D5;
border: 2px solid #50B6D5;
-moz-box-shadow: 0 0 6px rgba(0, 0, 0, 0.25) inset;
-webkit-box-shadow: 0 0 6px rgba(0, 0, 0, 0.25) inset;
box-shadow: 0 0 6px rgba(0, 0, 0, 0.25) inset; }

2
public/assets/css/neo.min.css vendored
View file

File diff suppressed because one or more lines are too long

2
views/about.erb
View file

@ -1,7 +1,7 @@
<div class="header-Outro">
<div class="row content single-Col">
<h1>About Neocities</h1>
<h3 class="subtitle">Your free web page is waiting.. once again.</h3>
<h3 class="subtitle">Your free web page is waiting&#8230; once again.</h3>
</div>
</div>