Conflicts: - `README.md`: Our README is completely different. Discarded upstream changes. - `app/javascript/packs/mailer.js`: We had removed the file. Move the changes to `app/javascript/core/mailer.js`.
		
			
				
	
	
		
			41 lines
		
	
	
		
			928 B
		
	
	
	
		
			Plaintext
		
	
	
	
	
	
			
		
		
	
	
			41 lines
		
	
	
		
			928 B
		
	
	
	
		
			Plaintext
		
	
	
	
	
	
- content_for :header_tags do
 | 
						|
  = render_initial_state
 | 
						|
 | 
						|
- content_for :content do
 | 
						|
  .admin-wrapper
 | 
						|
    .sidebar-wrapper
 | 
						|
      .sidebar-wrapper__inner
 | 
						|
        .sidebar
 | 
						|
          = link_to root_path do
 | 
						|
            = render_logo
 | 
						|
 | 
						|
          .sidebar__toggle
 | 
						|
            .sidebar__toggle__logo
 | 
						|
              = link_to root_path do
 | 
						|
                = logo_as_symbol(:wordmark)
 | 
						|
 | 
						|
            = link_to '#', class: 'sidebar__toggle__icon' do
 | 
						|
              = fa_icon 'bars'
 | 
						|
 | 
						|
          = render_navigation
 | 
						|
 | 
						|
    .content-wrapper
 | 
						|
      .content
 | 
						|
        .content-heading
 | 
						|
          - if content_for?(:heading)
 | 
						|
            = yield :heading
 | 
						|
          - else
 | 
						|
            %h2= yield :page_title
 | 
						|
 | 
						|
          - if :heading_actions
 | 
						|
            .content-heading-actions
 | 
						|
              = yield :heading_actions
 | 
						|
 | 
						|
        = render 'application/flashes'
 | 
						|
 | 
						|
        = yield
 | 
						|
 | 
						|
    .sidebar-wrapper.sidebar-wrapper--empty
 | 
						|
 | 
						|
= render template: 'layouts/application'
 |