Skip to content

Commit

Permalink
fixes styling on navbar for homepage
Browse files Browse the repository at this point in the history
  • Loading branch information
@VictorGarcia
VictorGarcia committed Aug 19, 2012
1 parent c854305 commit 2a19232
Show file tree
Hide file tree
Showing 7 changed files with 210 additions and 182 deletions.
2 changes: 2 additions & 0 deletions .gitignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,3 +6,5 @@ public/mail
public/images/pub
.sass-cache
*phpThumb_cache*
*.DS_Store
.idea/*
9 changes: 9 additions & 0 deletions .idea/codeStyleSettings.xml
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion application/layouts/scripts/map.phtml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
->appendStylesheet($this->baseUrl('contrib/bootstrap/css/bootstrap.css'), 'screen, projection')
->appendStylesheet($this->baseUrl('contrib/bootstrap/css/bootstrap-responsive.css'), 'screen, projection')
->appendStylesheet($this->baseUrl('/contrib/jquery-ui-1.8.17.custom/css/custom-theme/jquery-ui-1.8.17.custom.css'), 'screen, projection')
->appendStylesheet($this->baseUrl('/css/formalize/formalize.css'), 'screen, projection')
//->appendStylesheet($this->baseUrl('/css/formalize/formalize.css'), 'screen, projection')
->appendStylesheet('http://fonts.googleapis.com/css?family=Imprima', 'screen, projection')
->appendStylesheet($this->baseUrl('css/style.css'), 'screen, projection')
;
Expand Down
98 changes: 50 additions & 48 deletions application/views/scripts/index/index.phtml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,57 +10,59 @@
<a id="logo" class="brand" href="/">Dunia</a>

<form id="form" onsubmit="return false;" style="display: inline">
<ul class="nav">
<ul class="nav2">
<li><?php echo $this->form->location; ?></li>
<li><div style="width: 200px;">
<fieldset style="border: none; margin: 0px; padding: 0px;">
<label for="valueA" style="display:none;">From:</label>
<select name="valueA" id="valueA" style="display:none;">
<option value="9:00" selected="selected">9:00</option>
<option value="10:00">10:00</option>
<option value="11:00">11:00</option>
<option value="12:00">Noon</option>
<option value="13:00">13:00</option>
<option value="14:00">14:00</option>
<option value="15:00">15:00</option>
<option value="16:00">16:00</option>
<option value="17:00">17:00</option>
<option value="18:00">18:00</option>
<option value="19:00">19:00</option>
<option value="20:00">20:00</option>
<option value="21:00">21:00</option>
<option value="22:00">22:00</option>
<option value="23:00">23:00</option>
<option value="24:00">24:00</option>
</select>
<li>
<div id="slider">
<fieldset style="border: none; margin: 0px; padding: 0px;">
<label for="valueA" style="display:none;">From:</label>
<select name="valueA" id="valueA" style="display:none;">
<option value="9:00" selected="selected">9:00</option>
<option value="10:00">10:00</option>
<option value="11:00">11:00</option>
<option value="12:00">Noon</option>
<option value="13:00">13:00</option>
<option value="14:00">14:00</option>
<option value="15:00">15:00</option>
<option value="16:00">16:00</option>
<option value="17:00">17:00</option>
<option value="18:00">18:00</option>
<option value="19:00">19:00</option>
<option value="20:00">20:00</option>
<option value="21:00">21:00</option>
<option value="22:00">22:00</option>
<option value="23:00">23:00</option>
<option value="24:00">24:00</option>
</select>

<label for="valueB" style="display:none;">To:</label>
<select name="valueB" id="valueB" style="display:none;">
<option value="9:00">9:00</option>
<option value="10:00">10:00</option>
<option value="11:00">11:00</option>
<option value="12:00">Noon</option>
<option value="13:00">13:00</option>
<option value="14:00">14:00</option>
<option value="15:00">15:00</option>
<option value="16:00">16:00</option>
<option value="17:00">17:00</option>
<option value="18:00">18:00</option>
<option value="19:00">19:00</option>
<option value="20:00">20:00</option>
<option value="21:00">21:00</option>
<option value="22:00">22:00</option>
<option value="23:00">23:00</option>
<option value="24:00" selected="selected">24:00</option>
</select>
</fieldset>
</div></li>
<label for="valueB" style="display:none;">To:</label>
<select name="valueB" id="valueB" style="display:none;">
<option value="9:00">9:00</option>
<option value="10:00">10:00</option>
<option value="11:00">11:00</option>
<option value="12:00">Noon</option>
<option value="13:00">13:00</option>
<option value="14:00">14:00</option>
<option value="15:00">15:00</option>
<option value="16:00">16:00</option>
<option value="17:00">17:00</option>
<option value="18:00">18:00</option>
<option value="19:00">19:00</option>
<option value="20:00">20:00</option>
<option value="21:00">21:00</option>
<option value="22:00">22:00</option>
<option value="23:00">23:00</option>
<option value="24:00" selected="selected">24:00</option>
</select>
</fieldset>
</div>
</li>
<li>
<select style="width: auto" id="day-select">
<?php foreach(Model_Day::$daysName as $key => $value): ?>
<option <?php echo (($key == date('N')) ? 'selected="selected"': null); ?> value="<?php echo $key; ?>"><?php echo $value; ?></option>
<?php endforeach; ?>
</select>
<select id="day-select">
<?php foreach(Model_Day::$daysName as $key => $value): ?>
<option <?php echo (($key == date('N')) ? 'selected="selected"': null); ?> value="<?php echo $key; ?>"><?php echo $value; ?></option>
<?php endforeach; ?>
</select>
</li>
</ul>

Expand Down
18 changes: 15 additions & 3 deletions public/css/sass/style.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -131,23 +131,35 @@ h1 {

label {
float: left;
margin-left: 20px;
margin:3px 10px 0 20px;
font-size: 120%;
}

#form {
top: 8px;
display: inline;
position: relative;
float: left;
margin: 0;

ul.nav {
ul.nav2 {
@include inline-block-list-container;
padding-top: 8px;
> li {
@include inline-block-list-item;
margin: 0 10px;
}
}

#day-select {
width: auto;
margin-top: 1px;

}

#slider {
margin: -16px 20px 0 20px;
width: 200px;
}
}


Expand Down
22 changes: 11 additions & 11 deletions public/css/screen.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
* In this file you should write your main styles. (or centralize your imports)
* Import this file using the following HTML or equivalent:
* <link href="/stylesheets/screen.css" media="screen, projection" rel="stylesheet" type="text/css" /> */
/* line 17, ../../../../../../usr/local/share/gems/gems/compass-0.12.1/frameworks/compass/stylesheets/compass/reset/_utilities.scss */
/* line 17, /Library/Ruby/Gems/1.8/gems/compass-0.12.2/frameworks/compass/stylesheets/compass/reset/_utilities.scss */
html, body, div, span, applet, object, iframe,
h1, h2, h3, h4, h5, h6, p, blockquote, pre,
a, abbr, acronym, address, big, cite, code,
Expand All @@ -19,50 +19,50 @@ time, mark, audio, video {
margin: 0;
padding: 0;
border: 0;
font-size: 100%;
font: inherit;
font-size: 100%;
vertical-align: baseline;
}

/* line 20, ../../../../../../usr/local/share/gems/gems/compass-0.12.1/frameworks/compass/stylesheets/compass/reset/_utilities.scss */
body {
/* line 22, /Library/Ruby/Gems/1.8/gems/compass-0.12.2/frameworks/compass/stylesheets/compass/reset/_utilities.scss */
html {
line-height: 1;
}

/* line 22, ../../../../../../usr/local/share/gems/gems/compass-0.12.1/frameworks/compass/stylesheets/compass/reset/_utilities.scss */
/* line 24, /Library/Ruby/Gems/1.8/gems/compass-0.12.2/frameworks/compass/stylesheets/compass/reset/_utilities.scss */
ol, ul {
list-style: none;
}

/* line 24, ../../../../../../usr/local/share/gems/gems/compass-0.12.1/frameworks/compass/stylesheets/compass/reset/_utilities.scss */
/* line 26, /Library/Ruby/Gems/1.8/gems/compass-0.12.2/frameworks/compass/stylesheets/compass/reset/_utilities.scss */
table {
border-collapse: collapse;
border-spacing: 0;
}

/* line 26, ../../../../../../usr/local/share/gems/gems/compass-0.12.1/frameworks/compass/stylesheets/compass/reset/_utilities.scss */
/* line 28, /Library/Ruby/Gems/1.8/gems/compass-0.12.2/frameworks/compass/stylesheets/compass/reset/_utilities.scss */
caption, th, td {
text-align: left;
font-weight: normal;
vertical-align: middle;
}

/* line 28, ../../../../../../usr/local/share/gems/gems/compass-0.12.1/frameworks/compass/stylesheets/compass/reset/_utilities.scss */
/* line 30, /Library/Ruby/Gems/1.8/gems/compass-0.12.2/frameworks/compass/stylesheets/compass/reset/_utilities.scss */
q, blockquote {
quotes: none;
}
/* line 101, ../../../../../../usr/local/share/gems/gems/compass-0.12.1/frameworks/compass/stylesheets/compass/reset/_utilities.scss */
/* line 103, /Library/Ruby/Gems/1.8/gems/compass-0.12.2/frameworks/compass/stylesheets/compass/reset/_utilities.scss */
q:before, q:after, blockquote:before, blockquote:after {
content: "";
content: none;
}

/* line 30, ../../../../../../usr/local/share/gems/gems/compass-0.12.1/frameworks/compass/stylesheets/compass/reset/_utilities.scss */
/* line 32, /Library/Ruby/Gems/1.8/gems/compass-0.12.2/frameworks/compass/stylesheets/compass/reset/_utilities.scss */
a img {
border: none;
}

/* line 114, ../../../../../../usr/local/share/gems/gems/compass-0.12.1/frameworks/compass/stylesheets/compass/reset/_utilities.scss */
/* line 116, /Library/Ruby/Gems/1.8/gems/compass-0.12.2/frameworks/compass/stylesheets/compass/reset/_utilities.scss */
article, aside, details, figcaption, figure, footer, header, hgroup, menu, nav, section, summary {
display: block;
}
Loading

0 comments on commit 2a19232

Please sign in to comment.