Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

hopefully fixing hebrew problems by using smarter mysql gem

  • Loading branch information...
commit 3d2f35f51c27133da56a0181e3b52f7034884a70 1 parent e2f09a9
@abyx abyx authored
View
2  Gemfile
@@ -5,7 +5,7 @@ gem 'rails', '3.2.3'
# Bundle edge Rails instead:
# gem 'rails', :git => 'git://github.com/rails/rails.git'
-gem 'mysql'
+gem 'mysql2'
gem 'haml'
View
4 Gemfile.lock
@@ -55,7 +55,7 @@ GEM
treetop (~> 1.4.8)
mime-types (1.18)
multi_json (1.3.2)
- mysql (2.8.1)
+ mysql2 (0.3.11)
polyglot (0.3.3)
rack (1.4.1)
rack-cache (1.2)
@@ -121,7 +121,7 @@ DEPENDENCIES
coffee-rails (~> 3.2.1)
haml
jquery-rails
- mysql
+ mysql2
rails (= 3.2.3)
rspec-rails (~> 2.6)
sass-rails (~> 3.2.3)
View
32 app/assets/stylesheets/application.css → app/assets/stylesheets/application.css.scss
@@ -11,3 +11,35 @@
*= require_self
*= require_tree .
*/
+
+$logo_height: 80px;
+
+body {
+ margin: 0;
+ direction: rtl;
+ color: #282828;
+}
+
+#top_bar {
+ background-color: #D7F0DD;
+ height: 80px;
+ padding: 15px;
+ box-shadow: 3px 3px 5px 0px #CCC;
+}
+
+#top_bar #logo {
+ height: $logo_height;
+ float: right;
+}
+
+#top_bar #name {
+ float: left;
+ font-size: 20px;
+ color: #8f8f8f;
+}
+
+#top_bar #golda {
+ font-size: 25px;
+ margin-right: 20px;
+ line-height: $logo_height;
+}
View
30 app/assets/stylesheets/transactions.css.scss
@@ -7,24 +7,6 @@
width: 20%;
}
-#top_bar {
- background-color: #D7F0DD;
- height: 80px;
- padding: 15px;
- box-shadow: 3px 3px 5px 0px #CCC;
-}
-
-#top_bar #logo {
- height: 80px;
- float: right;
-}
-
-#top_bar #name {
- float: left;
- font-size: 20px;
- color: #8f8f8f;
-}
-
#data {
width: 80%;
float: left;
@@ -57,11 +39,7 @@
text-align: center;
}
-#txns table thead tr {
- background: #ccc;
-}
-
-#txns tbody tr:nth-child(even) {
+#txns table thead tr, #txns tbody tr:nth-child(even) {
background: #ccc;
}
@@ -69,12 +47,6 @@
background: #fff;
}
-body {
- margin: 0;
- direction: rtl;
- color: #282828;
-}
-
.clear {
clear: both;
}
View
1  app/views/layouts/application.html.haml
@@ -8,6 +8,7 @@
%body
#top_bar
%img#logo{:src => asset_path("golda.jpeg")}
+ %span#golda גולדה
- if @name.present?
#name= "Hi, #@name"
= yield
View
2  config/database.yml
@@ -1,5 +1,5 @@
development:
- adapter: mysql
+ adapter: mysql2
database: golda
encoding: utf8
username: root
Please sign in to comment.
Something went wrong with that request. Please try again.