Skip to content

Commit

Permalink
Merge branch 'release/0.4.0'
Browse files Browse the repository at this point in the history
  • Loading branch information
tayfunoziserikan committed Sep 13, 2013
2 parents 460e6b7 + 1791946 commit d958f80
Show file tree
Hide file tree
Showing 32 changed files with 1,906 additions and 222 deletions.
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -20,3 +20,5 @@ tmp
_yardoc
doc/
*.psd

build/
56 changes: 42 additions & 14 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,20 +1,48 @@

#### [Current]
* [78661d9](../../commit/78661d9) #20 Twitter Bootstrap 3 integration... __(Tayfun Öziş ERİKAN)__
* [96b9a9e](../../commit/96b9a9e) Update README.md __(Tayfun Öziş ERİKAN)__
* [b59ecc8](../../commit/b59ecc8) Update README.md __(Tayfun Öziş ERİKAN)__
* [5a2349c](../../commit/5a2349c) Update README.md __(Tayfun Öziş ERİKAN)__
* [3cba739](../../commit/3cba739) MIT license was added. __(Tayfun Öziş ERİKAN)__
* [6c19329](../../commit/6c19329) Version was updated. __(Tayfun Öziş ERİKAN)__
* [ae6428e](../../commit/ae6428e) - __(Tayfun Ozis ERIKAN)__ 31 Add more content view helpers - Navbar variables were fixed - Panel tools was fixed - Dropdown launcher menu position was fixed
* [371d9d1](../../commit/371d9d1) - __(Tayfun Ozis ERIKAN)__ 31 Add more content view helpers - Panel dimensions and colors was fixed - Font files was removed
* [b6f0f0f](../../commit/b6f0f0f) - __(Tayfun Ozis ERIKAN)__ 31 Add more content view helpers - Toolbar yield content was added - Font-family was added to global variables
* [4fc953c](../../commit/4fc953c) - __(Tayfun Ozis ERIKAN)__ 31 Add more content view helpers - Breadcrumb yield content was added
* [840b303](../../commit/840b303) - __(Tayfun Ozis ERIKAN)__ [#28](../../issues/28) Form headings was changed with fieldset and legend tags.
* [29bfd35](../../commit/29bfd35) - __(Tayfun Ozis ERIKAN)__ [#2](../../issues/2) Configure Middleman i18n - i18n was enabled - Sign in and forgot password page's translations was added
* [da668bd](../../commit/da668bd) - __(Tayfun Ozis ERIKAN)__ [#22](../../issues/22) Design login layout - Login layout was created - Sign in page was created - Forgot password page was created
* [ebf27f1](../../commit/ebf27f1) - __(Tayfun Ozis ERIKAN)__ [#30](../../issues/30) Create tables page - Pagination controls was added - Row actions was added - Row states was added
* [5a42f4b](../../commit/5a42f4b) - __(Tayfun Ozis ERIKAN)__ [#30](../../issues/30) Create tables page - Table th and td padding values was fixed - Table header and table footer was added - 'tables' css class was added to panels
* [7a444bb](../../commit/7a444bb) - __(Tayfun Ozis ERIKAN)__ [#30](../../issues/30) Create tables page - Table variations was added
* [cc04127](../../commit/cc04127) - __(Tayfun Ozis ERIKAN)__ [#30](../../issues/30) Create tables page - Quick search and filters was added
* [4cc2d8b](../../commit/4cc2d8b) - __(Tayfun Ozis ERIKAN)__ [#30](../../issues/30) Create tables page - Table variations was adde - No-padding panel was fixed for table usage
* [fa4375b](../../commit/fa4375b) - __(Tayfun Ozis ERIKAN)__ Dashboard improvements
* [74a5849](../../commit/74a5849) - __(Tayfun Ozis ERIKAN)__ [#28](../../issues/28) Create forms page - Jquery knob plugin was added
* [13f8847](../../commit/13f8847) - __(Tayfun Ozis ERIKAN)__ [#28](../../issues/28) Create forms page - Many form variations were added.
* [7173671](../../commit/7173671) - __(Tayfun Ozis ERIKAN)__ [#29](../../issues/29) Layout overflow problems was fixed.
* [4edfef7](../../commit/4edfef7) - __(Tayfun Ozis ERIKAN)__ [#28](../../issues/28) Create forms page - Default and horizontal forms were added - Bootstrap overrides sass file was added
* [c84da35](../../commit/c84da35) - __(Tayfun Ozis ERIKAN)__ [#27](../../issues/27) Custom view helpers was created
* [b7949e1](../../commit/b7949e1) - __(Tayfun Ozis ERIKAN)__ [#26](../../issues/26) Panel icon, title and toolbar was added
* [a54209d](../../commit/a54209d) - __(Tayfun Ozis ERIKAN)__ [#21](../../issues/21) Continues - Primary toolbar was created - Some bootstrap overrides was done - Navbar icons was added - Navbar badges was added - User profile image was added - Dock text toggle was added
* [75bce46](../../commit/75bce46) - __(Tayfun Ozis ERIKAN)__ [#21](../../issues/21) Continues - Beaker added to the bottom of the dock. - Breadcrumb position was fixed
* [9802e61](../../commit/9802e61) - __(Tayfun Ozis ERIKAN)__ [#21](../../issues/21) Continues - Dropdown menu styles were done - Dock dropdown menus were created - Dropdown menu hover effect was added
* [0806b7c](../../commit/0806b7c) - __(Tayfun Ozis ERIKAN)__ [#21](../../issues/21) Continues - Active item's highlight was added to the dock.
* [d029c03](../../commit/d029c03) - __(Tayfun Ozis ERIKAN)__ [#21](../../issues/21) Continues - Dock position was done - Navbar position was done - Content position was done
* [fe87883](../../commit/fe87883) - __(Tayfun Ozis ERIKAN)__ [#21](../../issues/21) Continues - Prepare layout - Prepare color swatches - Prepare variables

#### 0.3.0
* [acb8dce](../../commit/acb8dce) - __(Tayfun Ozis ERIKAN)__ 0.3.0
* [78661d9](../../commit/78661d9) - __(Tayfun Ozis ERIKAN)__ [#20](../../issues/20) Twitter Bootstrap 3 integration - Flat UI was removed - Bootstrap-sass (branch name: 3) gem was installed - Twitter Bootstrap 3 RC1 was integrated - Removed all unused files
* [96b9a9e](../../commit/96b9a9e) - __(Tayfun zi ERKAN)__ Update README.md
* [b59ecc8](../../commit/b59ecc8) - __(Tayfun zi ERKAN)__ Update README.md
* [5a2349c](../../commit/5a2349c) - __(Tayfun zi ERKAN)__ Update README.md
* [3cba739](../../commit/3cba739) - __(Tayfun Ozis ERIKAN)__ MIT license was added.
* [6c19329](../../commit/6c19329) - __(Tayfun zi ERKAN)__ Version was updated.

#### 0.2.0
* [1d76b56](../../commit/1d76b56) #9 Added Flat UI __(coskuntekin)__
* [366ec3d](../../commit/366ec3d) gitignore was updated. __(coskuntekin)__
* [1d76b56](../../commit/1d76b56) - __(coskuntekin)__ [#9](../../issues/9) Added Flat UI
* [366ec3d](../../commit/366ec3d) - __(coskuntekin)__ gitignore was updated.

#### 0.1.0
* [de1e5a9](../../commit/de1e5a9) Bump version 0.1.0 __(Tayfun Öziş ERİKAN)__
* [ceae0f2](../../commit/ceae0f2) #8 Font 'open sans' was integrated. __(coskuntekin)__
* [a221df3](../../commit/a221df3) #3 Font awesome was integrated. __(coskuntekin)__
* [4b1b2f1](../../commit/4b1b2f1) #1 Rubygems source switched to https __(Tayfun Öziş ERİKAN)__
* [57f5f93](../../commit/57f5f93) fixed index.html.haml __(coskuntekin)__
* [1c220c1](../../commit/1c220c1) #1 install middleman __(coskuntekin)__
* [de1e5a9](../../commit/de1e5a9) - __(Tayfun Ozis ERIKAN)__ Bump version 0.1.0
* [ceae0f2](../../commit/ceae0f2) - __(coskuntekin)__ [#8](../../issues/8) Font 'open sans' was integrated.
* [a221df3](../../commit/a221df3) - __(coskuntekin)__ [#3](../../issues/3) Font awesome was integrated.
* [4b1b2f1](../../commit/4b1b2f1) - __(Tayfun Ozis ERIKAN)__ [#1](../../issues/1) Rubygems source switched to https
* [57f5f93](../../commit/57f5f93) - __(coskuntekin)__ fixed index.html.haml
* [1c220c1](../../commit/1c220c1) - __(coskuntekin)__ [#1](../../issues/1) install middleman
2 changes: 1 addition & 1 deletion Gemfile.lock
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
GIT
remote: git://github.com/thomas-mcdonald/bootstrap-sass.git
revision: 79e7f27bcd70aa56682a8460c0bd6871bb6da172
revision: 0e88056ac5d58fb0bbd23d3fe929eac01712d964
branch: 3
specs:
bootstrap-sass (3.0.0.0)
Expand Down
2 changes: 1 addition & 1 deletion VERSION.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
0.3.0
0.4.0
11 changes: 7 additions & 4 deletions config.rb
Original file line number Diff line number Diff line change
Expand Up @@ -37,9 +37,10 @@
# page "/path/to/file.html", :layout => :otherlayout
#
# A path which all have the same layout
# with_layout :admin do
# page "/admin/*"
# end
with_layout :login do
page '/index.html'
page '/forgot_password.html'
end

# Proxy (fake) files
# page "/this-page-has-no-template.html", :proxy => "/template-file.html" do
Expand All @@ -63,7 +64,9 @@
# end
# end

set :fonts_dir, 'assets/fonts'
# i18n
activate :i18n

set :css_dir, 'assets/stylesheets'
set :js_dir, 'assets/javascripts'
set :images_dir, 'assets/images'
Expand Down
12 changes: 12 additions & 0 deletions helpers/view_helpers.rb
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
module ViewHelpers
def page(title, id)
@page_id = id
content_for :title do
title
end
end

def launcher_active(page)
@page_id == page ? {class:'active'} : {}
end
end
13 changes: 13 additions & 0 deletions locales/en.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
en:
login_heading: "Login to your account"
login_remember_me: "Remember me on this computer"
login_email: "Email address"
login_email_hint: "Enter your email address"
login_password: "Password"
forgot_password: "Forgot password?"
forgot_password_heading: "Reset your password"

sign_in: "Sign in"
sign_out: "Sign out"
send: "Send"
go_back: "Go back"
Binary file removed source/assets/fonts/glyphiconshalflings-regular.eot
Binary file not shown.
Binary file removed source/assets/fonts/glyphiconshalflings-regular.otf
Binary file not shown.
Loading

0 comments on commit d958f80

Please sign in to comment.