Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: Trade href="#" anchors for stylized buttons #2074

Merged
merged 17 commits into from
Mar 11, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 7 additions & 2 deletions src/DateHeader.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,14 @@ const DateHeader = ({ label, drilldownView, onDrillDown }) => {
}

return (
<a href="#" onClick={onDrillDown} role="cell">
<button
type="button"
className="rbc-button-link"
onClick={onDrillDown}
role="cell"
>
{label}
</a>
</button>
)
}

Expand Down
9 changes: 5 additions & 4 deletions src/EventEndingRow.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import PropTypes from 'prop-types'
import React from 'react'
import clsx from 'clsx'
import EventRowMixin from './EventRowMixin'
import { eventLevels } from './utils/eventLevels'
import range from 'lodash/range'
Expand Down Expand Up @@ -78,14 +79,14 @@ class EventEndingRow extends React.Component {
let count = eventsInSlot(segments, slot)

return count ? (
<a
<button
type="button"
key={'sm_' + slot}
href="#"
className={'rbc-show-more'}
className={clsx('rbc-button-link', 'rbc-show-more')}
onClick={e => this.showMore(slot, e)}
>
{localizer.messages.showMore(count)}
</a>
</button>
) : (
false
)
Expand Down
7 changes: 4 additions & 3 deletions src/TimeGridHeader.js
Original file line number Diff line number Diff line change
Expand Up @@ -46,12 +46,13 @@ class TimeGridHeader extends React.Component {
)}
>
{drilldownView ? (
<a
href="#"
<button
type="button"
className="rbc-button-link"
onClick={e => this.handleHeaderClick(date, drilldownView, e)}
>
{header}
</a>
</button>
) : (
<span>{header}</span>
)}
Expand Down
15 changes: 10 additions & 5 deletions src/less/month.less
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
@import './variables.less';


.rbc-row {
display: flex;
flex-direction: row;
Expand All @@ -18,7 +17,6 @@
background-color: @date-selection-bg-color;
}


.rbc-show-more {
&:extend(.rbc-ellipsis);
background-color: rgba(255, 255, 255, 0.3);
Expand All @@ -27,6 +25,11 @@
font-size: 85%;
height: auto;
line-height: normal;
color: @event-bg;
&:hover,
&:focus {
color: darken(@event-bg, 10%);
}
}

.rbc-month-view {
Expand Down Expand Up @@ -73,7 +76,9 @@
}

> a {
&, &:active, &:visited {
&,
&:active,
&:visited {
color: inherit;
text-decoration: none;
}
Expand Down Expand Up @@ -106,7 +111,7 @@
z-index: @event-zindex + 1;
border: 1px solid #e5e5e5;
background-color: #fff;
box-shadow: 0 5px 15px rgba(0,0,0,.25);
box-shadow: 0 5px 15px rgba(0, 0, 0, 0.25);
padding: 10px;

> * + * {
Expand All @@ -116,6 +121,6 @@

.rbc-overlay-header {
border-bottom: 1px solid #e5e5e5;
margin: -10px -10px 5px -10px ;
margin: -10px -10px 5px -10px;
padding: 2px 10px;
}
20 changes: 15 additions & 5 deletions src/less/styles.less
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
@import './variables.less';
@import './reset.less';


.rbc-calendar {
box-sizing: border-box;
height: 100%;
Expand Down Expand Up @@ -67,13 +66,25 @@
}

& > a {
&, &:active, &:visited {
&,
&:active,
&:visited {
color: inherit;
text-decoration: none;
}
}
}

.rbc-button-link {
color: inherit;
background: none;
margin: 0;
padding: 0;
border: none;
cursor: pointer;
user-select: text;
}

.rbc-row-content {
position: relative;
user-select: none;
Expand All @@ -95,16 +106,15 @@
display: none;
}

-ms-overflow-style: none; /* IE and Edge */
scrollbar-width: none; /* Firefox */
-ms-overflow-style: none; /* IE and Edge */
scrollbar-width: none; /* Firefox */
}
}

.rbc-today {
background-color: @today-highlight-bg;
}


@import './toolbar.less';
@import './event.less';
@import './month.less';
Expand Down
14 changes: 10 additions & 4 deletions src/sass/month.scss
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@
background-color: $date-selection-bg-color;
}


.rbc-show-more {
@extend .rbc-ellipsis;
background-color: rgba(255, 255, 255, 0.3);
Expand All @@ -26,6 +25,11 @@
font-size: 85%;
height: auto;
line-height: normal;
color: $event-bg;
&:hover,
&:focus {
color: darken($event-bg, 10%);
}
}

.rbc-month-view {
Expand Down Expand Up @@ -72,7 +76,9 @@
}

> a {
&, &:active, &:visited {
&,
&:active,
&:visited {
color: inherit;
text-decoration: none;
}
Expand Down Expand Up @@ -105,7 +111,7 @@
z-index: $event-zindex + 1;
border: 1px solid #e5e5e5;
background-color: #fff;
box-shadow: 0 5px 15px rgba(0,0,0,.25);
box-shadow: 0 5px 15px rgba(0, 0, 0, 0.25);
padding: 10px;

> * + * {
Expand All @@ -115,6 +121,6 @@

.rbc-overlay-header {
border-bottom: 1px solid #e5e5e5;
margin: -10px -10px 5px -10px ;
margin: -10px -10px 5px -10px;
padding: 2px 10px;
}
18 changes: 15 additions & 3 deletions src/sass/styles.scss
Original file line number Diff line number Diff line change
Expand Up @@ -66,13 +66,25 @@
}

& > a {
&, &:active, &:visited {
&,
&:active,
&:visited {
color: inherit;
text-decoration: none;
}
}
}

.rbc-button-link {
color: inherit;
background: none;
margin: 0;
padding: 0;
border: none;
cursor: pointer;
user-select: text;
}

.rbc-row-content {
position: relative;
user-select: none;
Expand All @@ -94,8 +106,8 @@
display: none;
}

-ms-overflow-style: none; /* IE and Edge */
scrollbar-width: none; /* Firefox */
-ms-overflow-style: none; /* IE and Edge */
scrollbar-width: none; /* Firefox */
}
}

Expand Down