Skip to content

Commit

Permalink
Merge pull request #1768 from epergo/ep/remove-sass
Browse files Browse the repository at this point in the history
Remove sass
  • Loading branch information
jkowens authored Mar 15, 2022
2 parents 2b5d1b4 + 6498eba commit b4f61f5
Show file tree
Hide file tree
Showing 29 changed files with 20 additions and 719 deletions.
1 change: 0 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
.DS_STORE
*.swp
*.rbc
*.sass-cache
/pkg
/Gemfile.lock
/coverage
Expand Down
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@

* Breaking change: Remove support for the textile template engine. [#1766](https://github.com/sinatra/sinatra/pull/1766) by Eloy Pérez

* Breaking change: Remove support for SASS as a template engine. [#1768](https://github.com/sinatra/sinatra/pull/1768) by Eloy Pérez

* Breaking change: Remove support for the defunct Less templating library. See [#1716](https://github.com/sinatra/sinatra/issues/1716), [#1715](https://github.com/sinatra/sinatra/issues/1715) for more discussion and background. [d1af2f1e](https://github.com/sinatra/sinatra/commit/d1af2f1e6c8710419dfe3102a660f7a32f0e67e3) by Olle Jonsson

* Breaking change: Remove Reel integration. [54597502](https://github.com/sinatra/sinatra/commit/545975025927a27a1daca790598620038979f1c5) by Olle Jonsson
Expand Down
1 change: 0 additions & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,6 @@ gem 'rabl'
gem 'builder'
gem 'erubi'
gem 'haml', '~> 5'
gem 'sass'
gem 'celluloid', '~> 0.16.0'
gem 'commonmarker', '~> 0.20.0', platforms: [ :ruby ]
gem 'pandoc-ruby', '~> 2.0.2'
Expand Down
39 changes: 1 addition & 38 deletions README.de.md
Original file line number Diff line number Diff line change
Expand Up @@ -53,8 +53,6 @@ diesen Server verwenden.
- [Erb Templates](#erb-templates)
- [Builder Templates](#builder-templates)
- [Nokogiri Templates](#nokogiri-templates)
- [Sass Templates](#sass-templates)
- [SCSS Templates](#scss-templates)
- [Liquid Templates](#liquid-templates)
- [Markdown Templates](#markdown-templates)
- [RDoc Templates](#rdoc-templates)
Expand Down Expand Up @@ -665,41 +663,6 @@ Nimmt ebenso einen Block für Inline-Templates entgegen (siehe Beispiel).

Nimmt ebenso einen Block für Inline-Templates entgegen (siehe Beispiel).

#### Sass Templates

<table>
<tr>
<td>Abhängigkeit</td>
<td><a href="http://sass-lang.com/">sass</a></td>
</tr>
<tr>
<td>Dateierweiterung</td>
<td><tt>.sass</tt></td>
</tr>
<tr>
<td>Beispiel</td>
<td><tt>sass :stylesheet, :style => :expanded</tt></td>
</tr>
</table>


#### SCSS Templates

<table>
<tr>
<td>Abhängigkeit</td>
<td><a href="http://sass-lang.com/">sass</a></td>
</tr>
<tr>
<td>Dateierweiterung</td>
<td><tt>.scss</tt></td>
</tr>
<tr>
<td>Beispiel</td>
<td><tt>scss :stylesheet, :style => :expanded</tt></td>
</tr>
</table>


#### Liquid Templates

Expand Down Expand Up @@ -2054,7 +2017,7 @@ Ein anderes Beispiel wäre, verschiedene Verzeichnisse für verschiedene Engines
zu verwenden:

```ruby
set :views, :sass => 'views/sass', :haml => 'templates', :default => 'views'
set :views, :haml => 'templates', :default => 'views'
helpers do
def find_template(views, name, engine, &block)
Expand Down
37 changes: 1 addition & 36 deletions README.es.md
Original file line number Diff line number Diff line change
Expand Up @@ -52,8 +52,6 @@ Se recomienda ejecutar `gem install puma`, porque Sinatra lo utilizará si está
* [Plantillas Erb](#plantillas-erb)
* [Plantillas Builder](#plantillas-builder)
* [Plantillas Nokogiri](#plantillas-nokogiri)
* [Plantillas Sass](#plantillas-sass)
* [Plantillas SCSS](#plantillas-scss)
* [Plantillas Liquid](#plantillas-liquid)
* [Plantillas Markdown](#plantillas-markdown)
* [Plantillas RDoc](#plantillas-rdoc)
Expand Down Expand Up @@ -673,39 +671,6 @@ También toma un bloque para plantillas inline (ver [ejemplo](#plantillas-inline

También toma un bloque para plantillas inline (ver [ejemplo](#plantillas-inline)).

#### Plantillas Sass

<table>
<tr>
<td>Dependencias</td>
<td><a href="http://sass-lang.com/" title="sass">sass</a></td>
</tr>
<tr>
<td>Extensiones de Archivo</td>
<td><tt>.sass</tt></td>
</tr>
<tr>
<td>Ejemplo</td>
<td><tt>sass :stylesheet, :style => :expanded</tt></td>
</tr>
</table>

#### Plantillas SCSS

<table>
<tr>
<td>Dependencias</td>
<td><a href="http://sass-lang.com/" title="sass">sass</a></td>
</tr>
<tr>
<td>Extensiones de Archivo</td>
<td><tt>.scss</tt></td>
</tr>
<tr>
<td>Ejemplo</td>
<td><tt>scss :stylesheet, :style => :expanded</tt></td>
</tr>
</table>

#### Plantillas Liquid

Expand Down Expand Up @@ -2060,7 +2025,7 @@ Otro ejemplo consiste en usar directorios diferentes para los distintos motores
de renderizado:

```ruby
set :views, :sass => 'vistas/sass', :haml => 'plantillas', :defecto => 'vistas'
set :views, :haml => 'plantillas', :defecto => 'vistas'
helpers do
def find_template(views, name, engine, &block)
Expand Down
38 changes: 1 addition & 37 deletions README.fr.md
Original file line number Diff line number Diff line change
Expand Up @@ -53,8 +53,6 @@ Sinatra utilise le server Thin quand il est disponible.
* [Templates Erb](#templates-erb)
* [Templates Builder](#templates-builder)
* [Templates Nokogiri](#templates-nokogiri)
* [Templates Sass](#templates-sass)
* [Templates SCSS](#templates-scss)
* [Templates Liquid](#templates-liquid)
* [Templates Markdown](#templates-markdown)
* [Templates RDoc](#templates-rdoc)
Expand Down Expand Up @@ -670,40 +668,6 @@ exemple).
Ce moteur accepte également un bloc pour des templates en ligne (voir
exemple).

#### Templates Sass

<table>
<tr>
<td>Dépendances</td>
<td><a href="http://sass-lang.com/" title="sass">sass</a></td>
</tr>
<tr>
<td>Extensions de fichier</td>
<td><tt>.sass</tt></td>
</tr>
<tr>
<td>Exemple</td>
<td><tt>sass :stylesheet, :style => :expanded</tt></td>
</tr>
</table>

#### Templates SCSS

<table>
<tr>
<td>Dépendances</td>
<td><a href="http://sass-lang.com/" title="sass">sass</a></td>
</tr>
<tr>
<td>Extensions de fichier</td>
<td><tt>.scss</tt></td>
</tr>
<tr>
<td>Exemple</td>
<td><tt>scss :stylesheet, :style => :expanded</tt></p>
</td>
</tr>
</table>

#### Templates Liquid

Expand Down Expand Up @@ -1987,7 +1951,7 @@ Un autre exemple est d'utiliser des répertoires différents pour des moteurs
de rendu différents :
```ruby
set :views, :sass => 'views/sass', :haml => 'templates', :default => 'views'
set :views, :haml => 'templates', :default => 'views'
helpers do
def find_template(vues, nom, moteur, &bloc)
Expand Down
28 changes: 0 additions & 28 deletions README.hu.md
Original file line number Diff line number Diff line change
Expand Up @@ -198,34 +198,6 @@ rendereléséhez:

Ez pedig a `./views/index.builder` állományt fogja renderelni.

### Sass sablonok

Sass sablonok használatához szükség lesz a haml gem-re vagy könyvtárra:

# Be kell importálni a haml, vagy a sass könyvtárat

```ruby
require 'sass'

get '/stylesheet.css' do
sass :stylesheet
end
```

Így a `./views/stylesheet.sass` fájl máris renderelhető.

A [Sass kapcsolói](http://haml.hamptoncatlin.com/docs/rdoc/classes/Sass.html)
globálisan is beállíthatók a Sinatra konfigurációi között, lásd az
[Options and Configurations](http://www.sinatrarb.com/configuration.html) lapot.
A globális beállításokat lehetőségünk van felülírni metódus szinten is.

```ruby
set :sass, {:style => :compact } # az alapértelmezett Sass stílus a :nested

get '/stylesheet.css' do
sass :stylesheet, :sass_options => {:style => :expanded } # felülírva
end
```

### Beágyazott sablonok

Expand Down
37 changes: 1 addition & 36 deletions README.ja.md
Original file line number Diff line number Diff line change
Expand Up @@ -50,8 +50,6 @@ PumaがあればSinatraはこれを利用するので、`gem install puma`する
* [Erb テンプレート](#erb-テンプレート)
* [Builder テンプレート](#builder-テンプレート)
* [Nokogiri テンプレート](#nokogiri-テンプレート)
* [Sass テンプレート](#sass-テンプレート)
* [SCSS テンプレート](#scss-テンプレート)
* [Liquid テンプレート](#liquid-テンプレート)
* [Markdown テンプレート](#markdown-テンプレート)
* [RDoc テンプレート](#rdoc-テンプレート)
Expand Down Expand Up @@ -608,39 +606,6 @@ get('/') { markdown :index }

インラインテンプレート用にブロックを取ることもできます(例を参照)。

#### Sass テンプレート

<table>
<tr>
<td>依存</td>
<td><a href="https://sass-lang.com/" title="sass">sass</a></td>
</tr>
<tr>
<td>ファイル拡張子</td>
<td><tt>.sass</tt></td>
</tr>
<tr>
<td>例</td>
<td><tt>sass :stylesheet, :style => :expanded</tt></td>
</tr>
</table>

#### Scss テンプレート

<table>
<tr>
<td>依存</td>
<td><a href="https://sass-lang.com/" title="sass">sass</a></td>
</tr>
<tr>
<td>ファイル拡張子</td>
<td><tt>.scss</tt></td>
</tr>
<tr>
<td>例</td>
<td><tt>scss :stylesheet, :style => :expanded</tt></td>
</tr>
</table>

#### Liquid テンプレート

Expand Down Expand Up @@ -1855,7 +1820,7 @@ end
他の例としては、異なるエンジン用の異なるディレクトリを使う場合です。

```ruby
set :views, :sass => 'views/sass', :haml => 'templates', :default => 'views'
set :views, :haml => 'templates', :default => 'views'

helpers do
def find_template(views, name, engine, &block)
Expand Down
37 changes: 1 addition & 36 deletions README.ko.md
Original file line number Diff line number Diff line change
Expand Up @@ -48,8 +48,6 @@ thin이 설치되어 있을 경우 Sinatra는 thin을 통해 실행합니다.
* [Erb 템플릿](#erb-템플릿)
* [Builder 템플릿](#builder-템플릿)
* [Nokogiri 템플릿](#nokogiri-템플릿)
* [Sass 템플릿](#sass-템플릿)
* [SCSS 템플릿](#scss-템플릿)
* [Liquid 템플릿](#liquid-템플릿)
* [Markdown 템플릿](#markdown-템플릿)
* [RDoc 템플릿](#rdoc-템플릿)
Expand Down Expand Up @@ -595,39 +593,6 @@ get('/') { markdown :index }

인라인 템플릿으로 블록을 받을 수도 있습니다(예제 참조).

#### Sass 템플릿

<table>
<tr>
<td>의존성</td>
<td><a href="http://sass-lang.com/">sass</a></td>
</tr>
<tr>
<td>파일 확장자</td>
<td><tt>.sass</tt></td>
</tr>
<tr>
<td>예제</td>
<td><tt>sass :stylesheet, :style => :expanded</tt></td>
</tr>
</table>

#### SCSS 템플릿

<table>
<tr>
<td>의존성</td>
<td><a href="http://sass-lang.com/">sass</a></td>
</tr>
<tr>
<td>파일 확장자</td>
<td><tt>.scss</tt></td>
</tr>
<tr>
<td>예제</td>
<td><tt>scss :stylesheet, :style => :expanded</tt></td>
</tr>
</table>

#### Liquid 템플릿

Expand Down Expand Up @@ -1856,7 +1821,7 @@ end
다른 예제는 각 엔진마다 다른 디렉터리를 사용할 경우입니다.

```ruby
set :views, :sass => 'views/sass', :haml => 'templates', :default => 'views'
set :views, :haml => 'templates', :default => 'views'
helpers do
def find_template(views, name, engine, &block)
Expand Down
Loading

0 comments on commit b4f61f5

Please sign in to comment.