Fase out bourbon
This commit is contained in:
@@ -5,10 +5,10 @@ source "http://rubygems.org"
|
||||
# development dependencies will be added by default to the :development group.
|
||||
gemspec
|
||||
|
||||
gem "rails", " ~> 7.0.1"
|
||||
gem "rails", " ~> 8.0.1"
|
||||
group :assets do
|
||||
gem 'sass-rails' #, ' ~> 5.0.0'
|
||||
gem 'bourbon', '~> 4.3.1'
|
||||
# gem 'bourbon', '~> 4.3.1'
|
||||
gem 'coffee-script'
|
||||
#gem 'therubyracer', :platforms => :ruby
|
||||
#gem 'less-rails'
|
||||
@@ -16,7 +16,7 @@ group :assets do
|
||||
gem 'ace-rails-ap'
|
||||
gem "jquery-rails"
|
||||
gem 'font-awesome-rails'
|
||||
gem 'tinymce-rails'
|
||||
# gem 'tinymce-rails'
|
||||
gem 'pickadate-rails'
|
||||
end
|
||||
|
||||
|
||||
@@ -34,7 +34,7 @@ Make sure that the locales you want to work with are specified in
|
||||
|
||||
This will add some gems you might like anyway, here a list:
|
||||
|
||||
* bourbon
|
||||
* bourbon # NOOOOOO
|
||||
* jquery-rails
|
||||
* tinymce-rails
|
||||
* sass-rails
|
||||
|
||||
@@ -9,7 +9,7 @@
|
||||
#= require ace/mode-yaml
|
||||
#= require ace/mode-haml
|
||||
# require tinymce-jquery
|
||||
#= require tinymce
|
||||
# require tinymce
|
||||
#= require pickadate/picker
|
||||
#= require pickadate/picker.date
|
||||
#= require pickadate/picker.time
|
||||
|
||||
@@ -1,10 +1,10 @@
|
||||
@import bourbon
|
||||
// @import bourbon
|
||||
#user-info
|
||||
float: right
|
||||
width: 400px
|
||||
height: 22px
|
||||
margin-top: -30px
|
||||
@include linear-gradient(#2989d8, #1e5799)
|
||||
// @include linear-gradient(#2989d8, #1e5799)
|
||||
color: white
|
||||
font-weight: bold
|
||||
padding: 4px
|
||||
|
||||
+2
-2
@@ -19,9 +19,9 @@ Gem::Specification.new do |s|
|
||||
s.test_files = `git ls-files -- {test,spec,features}/*`.split("\n")
|
||||
|
||||
s.add_runtime_dependency "email_validator", ">= 0"
|
||||
s.add_runtime_dependency "bourbon", ">= 0"
|
||||
# s.add_runtime_dependency "bourbon", ">= 0"
|
||||
s.add_runtime_dependency "slim-rails", ">= 0"
|
||||
s.add_runtime_dependency "tinymce-rails", ">= 0"
|
||||
# s.add_runtime_dependency "tinymce-rails", ">= 0"
|
||||
s.add_runtime_dependency "jquery-rails", ">= 0"
|
||||
s.add_runtime_dependency "paperclip", ">= 0"
|
||||
s.add_runtime_dependency "foundation-rails", ">= 0"
|
||||
|
||||
@@ -9,7 +9,7 @@ require 'paperclip'
|
||||
require 'jquery-rails'
|
||||
require 'bourbon'
|
||||
=end
|
||||
require 'tinymce-rails'
|
||||
# require 'tinymce-rails'
|
||||
module Cmtool
|
||||
class Engine < ::Rails::Engine
|
||||
isolate_namespace Cmtool
|
||||
@@ -21,7 +21,7 @@ module Cmtool
|
||||
require 'devise'
|
||||
require 'devise_simply_stored'
|
||||
require 'jquery-rails'
|
||||
require 'tinymce-rails'
|
||||
# require 'tinymce-rails'
|
||||
|
||||
require 'page' # app/models/page.rb
|
||||
require 'user' # app/models/user.rb
|
||||
|
||||
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
@@ -1 +0,0 @@
|
||||
tinyMCE.addI18n('ar.advhr_dlg',{size:"\u0627\u0644\u0627\u0631\u062a\u0641\u0627\u0639",noshade:"\u0644\u0627 \u0638\u0644",width:"\u0627\u0644\u0639\u0631\u0636",normal:"\u0627\u0644\u0637\u0628\u064a\u0639\u064a",widthunits:"\u0627\u0644\u0648\u062d\u062f\u0627\u062a"});
|
||||
@@ -1 +0,0 @@
|
||||
tinyMCE.addI18n('az.advhr_dlg',{size:"H\u00fcnd\u00fcrl\u00fcy\u00fc",noshade:"K\u00f6lg\u0259 yoxdur",width:"Eni",normal:"Normal",widthunits:"Units"});
|
||||
@@ -1 +0,0 @@
|
||||
tinyMCE.addI18n('be.advhr_dlg',{size:"\u0412\u044b\u0448\u044b\u043d\u044f",noshade:"\u0411\u0435\u0437 \u0446\u0435\u043d\u044e",width:"\u0428\u044b\u0440\u044b\u043d\u044f",normal:"\u0417\u0432\u044b\u0447\u0430\u0439\u043d\u0430\u044f",widthunits:"\u0410\u0434\u0437\u0456\u043d\u043a\u0456 \u0432\u044b\u043c\u044f\u0440\u044d\u043d\u043d\u044f"});
|
||||
@@ -1 +0,0 @@
|
||||
tinyMCE.addI18n('bg.advhr_dlg',{size:"\u0412\u0438\u0441\u043e\u0447\u0438\u043d\u0430",noshade:"\u0411\u0435\u0437 \u0441\u044f\u043d\u043a\u0430",width:"\u0428\u0438\u0440\u0438\u043d\u0430",normal:"\u041d\u043e\u0440\u043c\u0430\u043b\u043d\u0430",widthunits:"\u0415\u0434\u0438\u043d\u0438\u0446\u0438"});
|
||||
@@ -1 +0,0 @@
|
||||
tinyMCE.addI18n('bn.advhr_dlg',{size:"Height",noshade:"No shadow",width:"Width",normal:"Normal",widthunits:"Units"});
|
||||
@@ -1 +0,0 @@
|
||||
tinyMCE.addI18n('br.advhr_dlg',{size:"Altura",noshade:"Sem sombra",width:"Largura",normal:"Normal",widthunits:"Units"});
|
||||
@@ -1 +0,0 @@
|
||||
tinyMCE.addI18n('bs.advhr_dlg',{size:"Visina",noshade:"Bez sjene",width:"\u0160irina",normal:"Normal",widthunits:"Units"});
|
||||
@@ -1 +0,0 @@
|
||||
tinyMCE.addI18n('ca.advhr_dlg',{size:"Al\u00e7ada",noshade:"Sense sombra",width:"Amplada",normal:"Normal",widthunits:"Unitats"});
|
||||
@@ -1 +0,0 @@
|
||||
tinyMCE.addI18n('ch.advhr_dlg',{size:"\u9ad8\u5ea6",noshade:"\u65e0\u9634\u5f71",width:"\u5bbd\u5ea6",normal:"Normal",widthunits:"Units"});
|
||||
@@ -1 +0,0 @@
|
||||
tinyMCE.addI18n('cn.advhr_dlg',{size:"\u9ad8\u5ea6",noshade:"\u65e0\u9634\u5f71",width:"\u5bbd\u5ea6",normal:"\u5e38\u89c4",widthunits:"\u5355\u4f4d"});
|
||||
@@ -1 +0,0 @@
|
||||
tinyMCE.addI18n('cs.advhr_dlg',{size:"V\u00fd\u0161ka",noshade:"Bez st\u00ednu",width:"\u0160\u00ed\u0159ka",normal:"Norm\u00e1ln\u00ed",widthunits:"Jednotky"});
|
||||
@@ -1 +0,0 @@
|
||||
tinyMCE.addI18n('cy.advhr_dlg',{size:"Uchder",noshade:"Dim cysgod",width:"Lled",normal:"Normal",widthunits:"Unedau"});
|
||||
@@ -1 +0,0 @@
|
||||
tinyMCE.addI18n('da.advhr_dlg',{size:"H\u00f8jde",noshade:"Ingen skygge",width:"Bredde",normal:"Normal",widthunits:"Enheder"});
|
||||
@@ -1 +0,0 @@
|
||||
tinyMCE.addI18n('de.advhr_dlg',{size:"H\u00f6he",noshade:"Kein Schatten",width:"Breite",normal:"Normal",widthunits:"Einheiten"});
|
||||
@@ -1 +0,0 @@
|
||||
tinyMCE.addI18n('dv.advhr_dlg',{size:"Height",noshade:"No shadow",width:"Width",normal:"Normal",widthunits:"Units"});
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user