Skip to content

Commit

Permalink
Incorporated logo into the homepage
Browse files Browse the repository at this point in the history
  • Loading branch information
Rodolfo Carvalho committed Jun 17, 2014
1 parent f983342 commit f7f535f
Show file tree
Hide file tree
Showing 3 changed files with 18 additions and 5 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Expand Up @@ -3,6 +3,7 @@
## 2014-06-17

* [bugfix] Fixed broken menu links
* [feature] Incorporated logo into the homepage

## 2014-06-14

Expand Down
20 changes: 16 additions & 4 deletions assets/src/less/main.less
Expand Up @@ -12,10 +12,22 @@ div.navbar {
}
}

a.brand span.logo {
color: #ce4213;
background: white;
display: inline-block;
padding: 5px 0 5px 4px;
font-size: 0.9em;
line-height: 0.7em;
border-radius: 2px;
margin-bottom: -5px;
letter-spacing: 3px;
}

div.regex-parser-container {
input[type='text'], label, span.quotes {
font-family: monospace;
}
}

span.quotes {
color: rgb(25, 197, 25);
Expand Down Expand Up @@ -98,11 +110,11 @@ have provided within the ngAnimate attribute.
-ms-transition: 1s linear all; /* IE10 */
-o-transition: 1s linear all; /* Opera */
transition: 1s linear all; /* Future Browsers */

/* The animation preparation code */
opacity: 0;
}

/*
Keep in mind that you want to combine both CSS
classes together to avoid any CSS-specificity
Expand All @@ -111,4 +123,4 @@ conflicts
.animate-enter-setup.animate-enter-start {
/* The animation code itself */
opacity: 1;
}
}
2 changes: 1 addition & 1 deletion public/index.html
Expand Up @@ -23,7 +23,7 @@
<button type="button" class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse">
<span class="icon-bar" ng-repeat="item in menuItems"></span>
</button>
<h1><a class="brand" href="/">PyRegex</a></h1>
<h1><a class="brand" href="/"><span class="logo">.*</span> PyRegex</a></h1>
<div class="nav-collapse collapse">
<ul class="nav">
<li ng-repeat="item in menuItems" ng-class="{active: item.href == currentUrl, dropdown: hasLinks(item)}">
Expand Down

0 comments on commit f7f535f

Please sign in to comment.